[arrayfire] 297/408: Add typedef af_image_format af::imageFormat

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository arrayfire.

commit 05c3d62e065761228661b3d3f9cdf489cde6c2be
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Thu Aug 20 12:33:08 2015 -0400

    Add typedef af_image_format af::imageFormat
---
 include/af/defines.h    | 1 +
 include/af/image.h      | 4 ++--
 src/api/cpp/imageio.cpp | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/af/defines.h b/include/af/defines.h
index a84a07a..248df0f 100644
--- a/include/af/defines.h
+++ b/include/af/defines.h
@@ -326,6 +326,7 @@ namespace af
     typedef af_colormap ColorMap;
     typedef af_norm_type normType;
     typedef af_ycc_std YCCStd;
+    typedef af_image_format imageFormat;
 }
 
 #endif
diff --git a/include/af/image.h b/include/af/image.h
index 9c7ff01..74a3a32 100644
--- a/include/af/image.h
+++ b/include/af/image.h
@@ -67,7 +67,7 @@ AFAPI array loadImageMem(const void *ptr);
 
     \param[in] in is the arrayfire array to be saved as an image
     \param[in] format is the type of image to create in memory. The enum borrows from
-    the FREE_IMAGE_FORMAT enum of FreeImage. Other values not included in af_image_format
+    the FREE_IMAGE_FORMAT enum of FreeImage. Other values not included in imageFormat
     but included in FREE_IMAGE_FORMAT can also be passed to this function.
 
     \return a void* pointer which is a type cast of the FreeImage type FIMEMORY* pointer.
@@ -77,7 +77,7 @@ AFAPI array loadImageMem(const void *ptr);
 
     \ingroup imagemem_func_save
 */
-AFAPI void* saveImageMem(const array& in, const af_image_format format = AF_FIF_PNG);
+AFAPI void* saveImageMem(const array& in, const imageFormat format = AF_FIF_PNG);
 
 /**
     C++ Interface for deleting memory created by \ref saveImageMem or
diff --git a/src/api/cpp/imageio.cpp b/src/api/cpp/imageio.cpp
index f6d1680..7a80871 100644
--- a/src/api/cpp/imageio.cpp
+++ b/src/api/cpp/imageio.cpp
@@ -39,7 +39,7 @@ void saveImage(const char* filename, const array& in)
     AF_THROW(af_save_image(filename, in.get()));
 }
 
-void* saveImageMem(const array& in, const af_image_format format)
+void* saveImageMem(const array& in, const imageFormat format)
 {
     void* ptr = NULL;
     AF_THROW(af_save_image_memory(&ptr, in.get(), format));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git