Fixed merge

Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>

Author: ahcorde

include/gz/rendering/Scene.hh

@@ -1107,40 +1107,7 @@ namespace gz
       public: virtual LidarVisualPtr CreateLidarVisual(
                   unsigned int _id, const std::string &_name) = 0;
 
-<<<<<<< HEAD
       /// \brief Create new heightmap geomerty. The rendering::Heightmap will be
-=======
-      /// \brief Create new frusum visual. A unique ID and name will
-      /// automatically be assigned to the frustum visual.
-      /// \return The created frustum visual
-      public: virtual FrustumVisualPtr CreateFrustumVisual() = 0;
-
-      /// \brief Create new frustum visual with the given ID. A unique name
-      /// will automatically be assigned to the frustum visual. If the given
-      /// ID is already in use, NULL will be returned.
-      /// \param[in] _id ID of the new frustum visual
-      /// \return The created frustum visual
-      public: virtual FrustumVisualPtr CreateFrustumVisual(
-                  unsigned int _id) = 0;
-
-      /// \brief Create new frustum visual with the given name. A unique ID
-      /// will automatically be assigned to the frustum visual. If the given
-      /// name is already in use, NULL will be returned.
-      /// \param[in] _name Name of the new frustum visual
-      /// \return The created frustum visual
-      public: virtual FrustumVisualPtr CreateFrustumVisual(
-                  const std::string &_name) = 0;
-
-      /// \brief Create new frustum visual with the given name. If either
-      /// the given ID or name is already in use, NULL will be returned.
-      /// \param[in] _id ID of the frustum visual.
-      /// \param[in] _name Name of the new frustum visual.
-      /// \return The created frustum visual
-      public: virtual FrustumVisualPtr CreateFrustumVisual(
-                  unsigned int _id, const std::string &_name) = 0;
-
-      /// \brief Create new heightmap geometry. The rendering::Heightmap will be
->>>>>>> 7ac8abc9 (Code cleanup (#1217))
       /// created from the given HeightmapDescriptor.
       /// \param[in] _desc Data about the heightmap
       /// \return The created heightmap

test/integration/wide_angle_camera.cc

@@ -72,47 +72,6 @@ void OnNewWideAngleFrame(const unsigned char *_data,
 }
 
 //////////////////////////////////////////////////
-<<<<<<< HEAD
-=======
-/// \brief callback to get the wide angle camera image data
-void OnNewWideAngleFrameMono(const unsigned char *_data,
-                    unsigned int _width, unsigned int _height,
-                    unsigned int _channels,
-                    const std::string &_format)
-{
-  EXPECT_EQ(20u, _width);
-  EXPECT_EQ(20u, _height);
-  EXPECT_EQ(1u, _channels);
-
-  std::lock_guard<std::mutex> lock(g_mutex);
-
-  unsigned int bytesPerChannel = 0u;
-  unsigned int bufferSize = 0u;
-  if (_format == "L8")
-  {
-    bytesPerChannel = 1u;
-    bufferSize = _width * _height * _channels * bytesPerChannel;
-    if (!g_bufferL8)
-      g_bufferL8 = new unsigned char[bufferSize];
-    memcpy(g_bufferL8, _data, bufferSize);
-  }
-  else if (_format == "L16")
-  {
-    bytesPerChannel = 2u;
-    bufferSize = _width * _height * _channels * bytesPerChannel;
-    if (!g_bufferL16)
-      g_bufferL16 = new unsigned char[bufferSize];
-    memcpy(g_bufferL16, _data, bufferSize);
-  }
-
-  ASSERT_NE(0u, bytesPerChannel);
-  ASSERT_NE(0u, bufferSize);
-
-  g_counter++;
-}
-
-//////////////////////////////////////////////////
->>>>>>> 7ac8abc9 (Code cleanup (#1217))
 TEST_F(WideAngleCameraTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(WideAngleCamera))
 {
   CHECK_UNSUPPORTED_ENGINE("optix");