Changes following "Remove Sampler scene object"

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / atlas-manager / atlas-manager.h

diff --git a/dali-toolkit/internal/atlas-manager/atlas-manager.h b/dali-toolkit/internal/atlas-manager/atlas-manager.h
index 532be6f..6d41419 100644 (file)
--- a/dali-toolkit/internal/atlas-manager/atlas-manager.h
+++ b/dali-toolkit/internal/atlas-manager/atlas-manager.h
@@ -313,19 +313,6 @@ public:
                    bool optimize = false );
 
   /**
-   * @brief Combine two meshes, outputting the result into a new mesh
-   *
-   * @param[in] first First mesh
-   * @param[in] second Second mesh
-   * @param[in] optimize should we optimize vertex data
-   * @param[out] out resulting mesh
-   */
-  void StitchMesh( const Mesh2D& first,
-                   const Mesh2D& second,
-                   Mesh2D& out,
-                   bool optimize = false );
-
-  /**
    * @brief Get the BufferImage containing an atlas
    *
    * @param[in] atlas AtlasId returned when atlas was created
@@ -402,13 +389,13 @@ public:
   Material GetMaterial( AtlasId atlas ) const;
 
  /**
-   * @brief Get Sampler used by atlas
+   * @brief Get Image used by atlas
    *
    * @param atlas[in] atlas AtlasId
    *
    * @return Sampler used by atlas
    */
-  Sampler GetSampler( AtlasId atlas ) const;
+  Image GetImage( AtlasId atlas ) const;
 private:
 
   explicit DALI_INTERNAL AtlasManager(Internal::AtlasManager *impl);