Hide file format especific savers. Add generic image saver.

Misc fixes under OSX.

src/CMakeLists.txt

@@ -70,6 +70,15 @@ ELSE(MAYA_FOUND)
 	MESSAGE(STATUS "Looking for Maya - not found")
 ENDIF(MAYA_FOUND)
 
+# FreeImage
+INCLUDE(${NV_CMAKE_DIR}/FindFreeImage.cmake)
+IF(FREEIMAGE_FOUND)
+	SET(HAVE_FREEIMAGE ${FREEIMAGE_FOUND} CACHE BOOL "Set to TRUE if FreeImage is found, FALSE otherwise")
+	MESSAGE(STATUS "Looking for FreeImage - found")
+ELSE(FREEIMAGE_FOUND)
+	MESSAGE(STATUS "Looking for FreeImage - not found")
+ENDIF(FREEIMAGE_FOUND)
+
 # JPEG
 INCLUDE(FindJPEG)
 IF(JPEG_FOUND)
@@ -107,15 +116,6 @@ ELSE(OPENEXR_FOUND)
 	MESSAGE(STATUS "Looking for OpenEXR - not found")
 ENDIF(OPENEXR_FOUND)
 
-# FreeImage
-INCLUDE(${NV_CMAKE_DIR}/FindFreeImage.cmake)
-IF(FREEIMAGE_FOUND)
-	SET(HAVE_FREEIMAGE ${FREEIMAGE_FOUND} CACHE BOOL "Set to TRUE if FreeImage is found, FALSE otherwise")
-	MESSAGE(STATUS "Looking for FreeImage - found")
-ELSE(FREEIMAGE_FOUND)
-	MESSAGE(STATUS "Looking for FreeImage - not found")
-ENDIF(FREEIMAGE_FOUND)
-
 # Qt
 FIND_PACKAGE(Qt4)
 

src/nvimage/ImageIO.cpp

@@ -14,6 +14,10 @@
 #include <nvcore/StdStream.h>
 
 // Extern
+#if defined(HAVE_FREEIMAGE)
+#	include <FreeImage.h>
+#else
+
 #if defined(HAVE_JPEG)
 extern "C" {
 #	include <jpeglib.h>
@@ -38,32 +42,58 @@ extern "C" {
 #	include <ImfArray.h>
 #endif
 
-#if defined(HAVE_FREEIMAGE)
+#endif // defined(HAVE_FREEIMAGE)
-#	include <FreeImage.h>
-#endif
 
 using namespace nv;
 
-namespace {
+namespace nv
+{
+	namespace ImageIO
+	{
+	#if defined(HAVE_FREEIMAGE)
 
-	// Array of image load plugins.
+		static Image * loadFreeImage(FREE_IMAGE_FORMAT fif, Stream & s);
-//	static HashMap<String, ImageInput_Plugin> s_plugin_load_map;
+		static FloatImage * loadFloatFreeImage(FREE_IMAGE_FORMAT fif, Stream & s);
 
-	// Array of image save plugins.
+		static bool saveFreeImage(FREE_IMAGE_FORMAT fif, Stream & s, const Image * img, const ImageMetaData * tags/*=NULL*/);
-//	static HashMap<String, ImageOutput_Plugin> s_plugin_save_map;
+		static bool saveFloatFreeImage(FREE_IMAGE_FORMAT fif, Stream & s, const FloatImage * img);
 
-	struct Color555 {
+	#else // defined(HAVE_FREEIMAGE)
-		uint16 b : 5;
-		uint16 g : 5;
-		uint16 r : 5;
-	};
 
-} // namespace
+		struct Color555 {
+			uint16 b : 5;
+			uint16 g : 5;
+			uint16 r : 5;
+		};
 
-#if defined(HAVE_FREEIMAGE)
+		static Image * loadTGA(Stream & s);
-static Image * loadFreeImage(FREE_IMAGE_FORMAT fif, Stream & s);
+		static bool saveTGA(Stream & s, const Image * img);
-static FloatImage * loadFloatFreeImage(FREE_IMAGE_FORMAT fif, Stream & s);
+
-#endif
+		static Image * loadPSD(Stream & s);
+
+	#if defined(HAVE_PNG)
+		static Image * loadPNG(Stream & s);
+		static bool savePNG(Stream & s, const Image * img, const PngCommentsMap & comments = PngCommentsMap());
+	#endif
+
+	#if defined(HAVE_JPEG)
+		static Image * loadJPG(Stream & s);
+	#endif
+
+	#if defined(HAVE_TIFF)
+		static FloatImage * loadFloatTIFF(const char * fileName, Stream & s);
+		static bool saveFloatTIFF(const char * fileName, const FloatImage * fimage, uint base_component, uint num_components);
+	#endif
+
+	#if defined(HAVE_OPENEXR)
+		static FloatImage * loadFloatEXR(const char * fileName, Stream & s);
+		static bool saveFloatEXR(const char * fileName, const FloatImage * fimage, uint base_component, uint num_components);
+	#endif
+
+	#endif // defined(HAVE_FREEIMAGE)
+
+	} // ImageIO namespace
+} // nv namespace
 
 Image * nv::ImageIO::load(const char * fileName)
 {
@@ -85,15 +115,15 @@ Image * nv::ImageIO::load(const char * fileName, Stream & s)
 
 	const char * extension = Path::extension(fileName);
 
-	if (strCaseCmp(extension, ".tga") == 0) {
-		return ImageIO::loadTGA(s);
-	}
 #if defined(HAVE_FREEIMAGE)
 	FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(fileName);
 	if (fif != FIF_UNKNOWN && FreeImage_FIFSupportsReading(fif)) {
 		return loadFreeImage(fif, s);
 	}
-#endif
+#else // defined(HAVE_FREEIMAGE)
+	if (strCaseCmp(extension, ".tga") == 0) {
+		return loadTGA(s);
+	}
 #if defined(HAVE_JPEG)
 	if (strCaseCmp(extension, ".jpg") == 0 || strCaseCmp(extension, ".jpeg") == 0) {
 		return loadJPG(s);
@@ -104,17 +134,15 @@ Image * nv::ImageIO::load(const char * fileName, Stream & s)
 		return loadPNG(s);
 	}
 #endif
-
 	if (strCaseCmp(extension, ".psd") == 0) {
 		return loadPSD(s);
 	}
-
+#endif // defined(HAVE_FREEIMAGE)
-	// @@ use image plugins?
 
 	return NULL;
 }
 
-bool nv::ImageIO::save(const char * fileName, Stream & s, const Image * img)
+bool nv::ImageIO::save(const char * fileName, Stream & s, const Image * img, const ImageMetaData * tags/*=NULL*/)
 {
 	nvDebugCheck(fileName != NULL);
 	nvDebugCheck(s.isSaving());
@@ -122,19 +150,27 @@ bool nv::ImageIO::save(const char * fileName, Stream & s, const Image * img)
 
 	const char * extension = Path::extension(fileName);
 
+#if defined(HAVE_FREEIMAGE)
+	FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(fileName);
+	if (fif != FIF_UNKNOWN && FreeImage_FIFSupportsWriting(fif)) {
+#pragma message(NV_FILE_LINE "TODO: implement saveFreeImage")
+		//return saveFreeImage(fif, s, img, tags);
+	}
+#else
 	if (strCaseCmp(extension, ".tga") == 0) {
-		return ImageIO::saveTGA(s, img);
+		return saveTGA(s, img);
 	}
 #if defined(HAVE_PNG)
 	if (strCaseCmp(extension, ".png") == 0) {
-		return ImageIO::savePNG(s, img);
+		return savePNG(s, img, tags);
 	}
+#endif
 #endif
 
 	return false;
 }
 
-bool nv::ImageIO::save(const char * fileName, const Image * img)
+bool nv::ImageIO::save(const char * fileName, const Image * img, const ImageMetaData * tags/*=NULL*/)
 {
 	nvDebugCheck(fileName != NULL);
 	nvDebugCheck(img != NULL);
@@ -145,7 +181,7 @@ bool nv::ImageIO::save(const char * fileName, const Image * img)
 		return false;
 	}
 
-	return ImageIO::save(fileName, stream, img);
+	return ImageIO::save(fileName, stream, img, tags);
 }
 
 FloatImage * nv::ImageIO::loadFloat(const char * fileName)
@@ -167,6 +203,12 @@ FloatImage * nv::ImageIO::loadFloat(const char * fileName, Stream & s)
 
 	const char * extension = Path::extension(fileName);
 
+#if defined(HAVE_FREEIMAGE)
+	FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(fileName);
+	if (fif != FIF_UNKNOWN && FreeImage_FIFSupportsReading(fif)) {
+		return loadFloatFreeImage(fif, s);
+	}
+#else // defined(HAVE_FREEIMAGE)
 #if defined(HAVE_TIFF)
 	if (strCaseCmp(extension, ".tif") == 0 || strCaseCmp(extension, ".tiff") == 0) {
 		return loadFloatTIFF(fileName, s);
@@ -177,12 +219,7 @@ FloatImage * nv::ImageIO::loadFloat(const char * fileName, Stream & s)
 		return loadFloatEXR(fileName, s);
 	}
 #endif
-#if defined(HAVE_FREEIMAGE)
+#endif // defined(HAVE_FREEIMAGE)
-	FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(fileName);
-	if (fif != FIF_UNKNOWN && FreeImage_FIFSupportsReading(fif)) {
-		return loadFloatFreeImage(fif, s);
-	}
-#endif
 
 	return NULL;
 }
@@ -192,17 +229,22 @@ bool nv::ImageIO::saveFloat(const char * fileName, const FloatImage * fimage, ui
 {
 	const char * extension = Path::extension(fileName);
 
+#if defined(HAVE_FREEIMAGE)
+	FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(fileName);
+	if (fif != FIF_UNKNOWN && FreeImage_FIFSupportsWriting(fif)) {
+#pragma message(NV_FILE_LINE "TODO: Implement saveFloatFreeImage")
+		//return saveFloatFreeImage(fif, s);
+		return false;
+	}
+#else // defined(HAVE_FREEIMAGE)
 #if defined(HAVE_OPENEXR)
-	if (strCaseCmp(extension, ".exr") == 0)
+	if (strCaseCmp(extension, ".exr") == 0) {
-	{
+		return saveFloatEXR(fileName, fimage, base_component, num_components);
-		return ImageIO::saveFloatEXR(fileName, fimage, base_component, num_components);
 	}
 #endif
-
 #if defined(HAVE_TIFF)
-	if (strCaseCmp(extension, ".tif") == 0 || strCaseCmp(extension, ".tiff") == 0)
+	if (strCaseCmp(extension, ".tif") == 0 || strCaseCmp(extension, ".tiff") == 0) {
-	{
+		return saveFloatTIFF(fileName, fimage, base_component, num_components);
-		return ImageIO::saveFloatTIFF(fileName, fimage, base_component, num_components);
 	}
 #endif
 
@@ -229,10 +271,208 @@ bool nv::ImageIO::saveFloat(const char * fileName, const FloatImage * fimage, ui
 
 		return ImageIO::save(fileName, image.ptr());
 	}
+#endif // defined(HAVE_FREEIMAGE)
 
 	return false;
 }
 
+#if defined(HAVE_FREEIMAGE)
+
+unsigned DLL_CALLCONV ReadProc(void *buffer, unsigned size, unsigned count, fi_handle handle)
+{
+	Stream * s = (Stream *) handle;
+	s->serialize(buffer, size * count);
+	return count;
+}
+
+int DLL_CALLCONV SeekProc(fi_handle handle, long offset, int origin)
+{
+	Stream * s = (Stream *) handle;
+
+	switch(origin) {
+		case SEEK_SET :
+			s->seek(offset);
+			break;
+		case SEEK_CUR :
+			s->seek(s->tell() + offset);
+			break;
+		default :
+			return 1;
+	}
+
+	return 0;
+}
+
+long DLL_CALLCONV TellProc(fi_handle handle)
+{
+	Stream * s = (Stream *) handle;
+	return s->tell();
+}
+
+
+Image * nv::ImageIO::loadFreeImage(FREE_IMAGE_FORMAT fif, Stream & s)
+{
+	nvCheck(!s.isError());
+
+	FreeImageIO io;
+	io.read_proc = ReadProc;
+	io.write_proc = NULL;
+	io.seek_proc = SeekProc;
+	io.tell_proc = TellProc;
+
+	FIBITMAP * bitmap = FreeImage_LoadFromHandle(fif, &io, (fi_handle)&s, 0);
+
+	if (bitmap == NULL)
+	{
+		return NULL;
+	}
+
+	const int w = FreeImage_GetWidth(bitmap);
+	const int h = FreeImage_GetHeight(bitmap);
+
+	if (FreeImage_GetImageType(bitmap) == FIT_BITMAP)
+	{
+		if (FreeImage_GetBPP(bitmap) != 32)
+		{
+			FIBITMAP * tmp = FreeImage_ConvertTo32Bits(bitmap);
+			FreeImage_Unload(bitmap);
+			bitmap = tmp;
+		}
+	}
+	else
+	{
+		// @@ Use tone mapping?
+		FIBITMAP * tmp = FreeImage_ConvertToType(bitmap, FIT_BITMAP, true);
+		FreeImage_Unload(bitmap);
+		bitmap = tmp;
+	}
+
+
+	Image * image = new Image();
+	image->allocate(w, h);
+
+	// Copy the image over to our internal format, FreeImage has the scanlines bottom to top though.
+	for (int y=0; y < h; y++)
+	{
+		const void * src = FreeImage_GetScanLine(bitmap, h - y - 1);
+		void * dst = image->scanline(y);
+
+		memcpy(dst, src, 4 * w);
+	}
+
+	FreeImage_Unload(bitmap);
+
+	return image;
+}
+
+FloatImage * nv::ImageIO::loadFloatFreeImage(FREE_IMAGE_FORMAT fif, Stream & s)
+{
+	nvCheck(!s.isError());
+
+	FreeImageIO io;
+	io.read_proc = ReadProc;
+	io.write_proc = NULL;
+	io.seek_proc = SeekProc;
+	io.tell_proc = TellProc;
+
+	FIBITMAP * bitmap = FreeImage_LoadFromHandle(fif, &io, (fi_handle)&s, 0);
+
+	if (bitmap == NULL)
+	{
+		return NULL;
+	}
+
+	const int w = FreeImage_GetWidth(bitmap);
+	const int h = FreeImage_GetHeight(bitmap);
+
+	FREE_IMAGE_TYPE fit = FreeImage_GetImageType(bitmap);
+
+	FloatImage * floatImage = new FloatImage();
+
+	switch (fit)
+	{
+		case FIT_FLOAT:
+			floatImage->allocate(1, w, h);
+
+			for (int y=0; y < h; y++)
+			{
+				const float * src = (const float *)FreeImage_GetScanLine(bitmap, h - y - 1 );
+				float * dst = floatImage->scanline(y, 0);
+
+				for (int x=0; x < w; x++)
+				{
+					dst[x] = src[x];
+				}
+			}
+			break;
+		case FIT_COMPLEX:
+			floatImage->allocate(2, w, h);
+
+			for (int y=0; y < h; y++)
+			{
+				const FICOMPLEX * src = (const FICOMPLEX *)FreeImage_GetScanLine(bitmap, h - y - 1 );
+
+				float * dst_real = floatImage->scanline(y, 0);
+				float * dst_imag = floatImage->scanline(y, 1);
+
+				for (int x=0; x < w; x++)
+				{
+					dst_real[x] = (float)src[x].r;
+					dst_imag[x] = (float)src[x].i;
+				}
+			}
+			break;
+		case FIT_RGBF:
+			floatImage->allocate(3, w, h);
+
+			for (int y=0; y < h; y++)
+			{
+				const FIRGBF * src = (const FIRGBF *)FreeImage_GetScanLine(bitmap, h - y - 1 );
+
+				float * dst_red = floatImage->scanline(y, 0);
+				float * dst_green = floatImage->scanline(y, 1);
+				float * dst_blue = floatImage->scanline(y, 2);
+
+				for (int x=0; x < w; x++)
+				{
+					dst_red[x] = src[x].red;
+					dst_green[x] = src[x].green;
+					dst_blue[x] = src[x].blue;
+				}
+			}
+			break;
+		case FIT_RGBAF:
+			floatImage->allocate(4, w, h);
+
+			for (int y=0; y < h; y++)
+			{
+				const FIRGBAF * src = (const FIRGBAF *)FreeImage_GetScanLine(bitmap, h - y - 1 );
+
+				float * dst_red = floatImage->scanline(y, 0);
+				float * dst_green = floatImage->scanline(y, 1);
+				float * dst_blue = floatImage->scanline(y, 2);
+				float * dst_alpha = floatImage->scanline(y, 3);
+
+				for (int x=0; x < w; x++)
+				{
+					dst_red[x] = src[x].red;
+					dst_green[x] = src[x].green;
+					dst_blue[x] = src[x].blue;
+					dst_alpha[x] = src[x].alpha;
+				}
+			}
+			break;
+		default:
+			delete floatImage;
+			floatImage = NULL;
+	}
+
+	FreeImage_Unload(bitmap);
+
+	return floatImage;
+}
+
+#else defined(HAVE_FREEIMAGE)
 
 /// Load TGA image.
 Image * nv::ImageIO::loadTGA(Stream & s)
@@ -256,7 +496,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
 			// no break is intended!
 		case TGA_TYPE_INDEXED:
 			if( tga.colormap_type!=1 || tga.colormap_size!=24 || tga.colormap_length>256 ) {
-				nvDebug( "*** ImageIO::loadTGA: Error, only 24bit paletted images are supported.\n" );
+				nvDebug( "*** loadTGA: Error, only 24bit paletted images are supported.\n" );
 				return false;
 			}
 			pal = true;
@@ -277,7 +517,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
 			break;
 
 		default:
-			nvDebug( "*** ImageIO::loadTGA: Error, unsupported image type.\n" );
+			nvDebug( "*** loadTGA: Error, unsupported image type.\n" );
 			return false;
 	}
 
@@ -621,206 +861,6 @@ Image * nv::ImageIO::loadPSD(Stream & s)
 	return img.release();
 }
 
-
-#if defined(HAVE_FREEIMAGE)
-
-unsigned DLL_CALLCONV ReadProc(void *buffer, unsigned size, unsigned count, fi_handle handle)
-{
-	Stream * s = (Stream *) handle;
-	s->serialize(buffer, size * count);
-	return count;
-}
-
-int DLL_CALLCONV SeekProc(fi_handle handle, long offset, int origin)
-{
-	Stream * s = (Stream *) handle;
-	
-	switch(origin) {
-		case SEEK_SET :
-			s->seek(offset);
-			break;
-		case SEEK_CUR :
-			s->seek(s->tell() + offset);
-			break;
-		default :
-			return 1;
-	}
-  
-	return 0;
-}
-
-long DLL_CALLCONV TellProc(fi_handle handle)
-{
-	Stream * s = (Stream *) handle;
-	return s->tell();
-}
-
-
-Image * loadFreeImage(FREE_IMAGE_FORMAT fif, Stream & s)
-{
-	nvCheck(!s.isError());
-
-	FreeImageIO io;
-	io.read_proc = ReadProc;
-	io.write_proc = NULL;
-	io.seek_proc = SeekProc;
-	io.tell_proc = TellProc;
-	
-	FIBITMAP * bitmap = FreeImage_LoadFromHandle(fif, &io, (fi_handle)&s, 0);
-	
-	if (bitmap == NULL)
-	{
-		return NULL;
-	}
-	
-	const int w = FreeImage_GetWidth(bitmap);
-	const int h = FreeImage_GetHeight(bitmap);
-	
-	if (FreeImage_GetImageType(bitmap) == FIT_BITMAP)
-	{
-		if (FreeImage_GetBPP(bitmap) != 32)
-		{
-			FIBITMAP * tmp = FreeImage_ConvertTo32Bits(bitmap);
-			FreeImage_Unload(bitmap);
-			bitmap = tmp;
-		}
-	}
-	else
-	{
-		// @@ Use tone mapping?
-		FIBITMAP * tmp = FreeImage_ConvertToType(bitmap, FIT_BITMAP, true);
-		FreeImage_Unload(bitmap);
-		bitmap = tmp;
-	}
-	
-	
-	Image * image = new Image();
-	image->allocate(w, h);
-	
-	// Copy the image over to our internal format, FreeImage has the scanlines bottom to top though.
-	for (int y=0; y < h; y++)
-	{
-		const void * src = FreeImage_GetScanLine(bitmap, h - y - 1);
-		void * dst = image->scanline(y);		
-		
-		memcpy(dst, src, 4 * w);
-	}
-	
-	FreeImage_Unload(bitmap);
-	
-	return image;
-}
-
-FloatImage * loadFloatFreeImage(FREE_IMAGE_FORMAT fif, Stream & s)
-{
-	nvCheck(!s.isError());
-
-	FreeImageIO io;
-	io.read_proc = ReadProc;
-	io.write_proc = NULL;
-	io.seek_proc = SeekProc;
-	io.tell_proc = TellProc;
-	
-	FIBITMAP * bitmap = FreeImage_LoadFromHandle(fif, &io, (fi_handle)&s, 0);
-	
-	if (bitmap == NULL)
-	{
-		return NULL;
-	}
-	
-	const int w = FreeImage_GetWidth(bitmap);
-	const int h = FreeImage_GetHeight(bitmap);
-
-	FREE_IMAGE_TYPE fit = FreeImage_GetImageType(bitmap);
-
-	FloatImage * floatImage = new FloatImage();
-	
-	switch (fit)
-	{
-		case FIT_FLOAT:
-			floatImage->allocate(1, w, h);
-		
-			for (int y=0; y < h; y++)
-			{
-				const float * src = (const float *)FreeImage_GetScanLine(bitmap, h - y - 1 );
-				float * dst = floatImage->scanline(y, 0);
-				
-				for (int x=0; x < w; x++)
-				{
-					dst[x] = src[x];
-				}
-			}
-			break;
-		case FIT_COMPLEX:
-			floatImage->allocate(2, w, h);
-		
-			for (int y=0; y < h; y++)
-			{
-				const FICOMPLEX * src = (const FICOMPLEX *)FreeImage_GetScanLine(bitmap, h - y - 1 );
-
-				float * dst_real = floatImage->scanline(y, 0);
-				float * dst_imag = floatImage->scanline(y, 1);
-				
-				for (int x=0; x < w; x++)
-				{
-					dst_real[x] = (float)src[x].r;
-					dst_imag[x] = (float)src[x].i;
-				}
-			}
-			break;
-		case FIT_RGBF:
-			floatImage->allocate(3, w, h);
-		
-			for (int y=0; y < h; y++)
-			{
-				const FIRGBF * src = (const FIRGBF *)FreeImage_GetScanLine(bitmap, h - y - 1 );
-
-				float * dst_red = floatImage->scanline(y, 0);
-				float * dst_green = floatImage->scanline(y, 1);
-				float * dst_blue = floatImage->scanline(y, 2);
-				
-				for (int x=0; x < w; x++)
-				{
-					dst_red[x] = src[x].red;
-					dst_green[x] = src[x].green;
-					dst_blue[x] = src[x].blue;
-				}
-			}
-			break;
-		case FIT_RGBAF:
-			floatImage->allocate(4, w, h);
-		
-			for (int y=0; y < h; y++)
-			{
-				const FIRGBAF * src = (const FIRGBAF *)FreeImage_GetScanLine(bitmap, h - y - 1 );
-
-				float * dst_red = floatImage->scanline(y, 0);
-				float * dst_green = floatImage->scanline(y, 1);
-				float * dst_blue = floatImage->scanline(y, 2);
-				float * dst_alpha = floatImage->scanline(y, 3);
-				
-				for (int x=0; x < w; x++)
-				{
-					dst_red[x] = src[x].red;
-					dst_green[x] = src[x].green;
-					dst_blue[x] = src[x].blue;
-					dst_alpha[x] = src[x].alpha;
-				}
-			}
-			break;
-		default:
-			delete floatImage;
-			floatImage = NULL;
-	}
-	
-	FreeImage_Unload(bitmap);
-	
-	return floatImage;
-}
-
-#endif // defined(HAVE_FREEIMAGE)
-
-
 #if defined(HAVE_PNG)
 
 static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
@@ -987,7 +1027,7 @@ static void user_write_data(png_structp png_ptr, png_bytep data, png_size_t leng
 
 static void user_write_flush(png_structp png_ptr) { }
 
-bool nv::ImageIO::savePNG(Stream & s, const Image * img, const PngCommentsMap & comments)
+bool nv::ImageIO::savePNG(Stream & s, const Image * img, const ImageMetaData * tags/*=NULL*/)
 {
 	nvCheck(!s.isError());
 	nvCheck(img != NULL);
@@ -1036,19 +1076,19 @@ bool nv::ImageIO::savePNG(Stream & s, const Image * img, const PngCommentsMap &
 	png_set_rows(png_ptr, info_ptr, row_data);
 
 	png_text * text = NULL;
-	if (comments.size() > 0)
+	if (tags != NULL && tags->count() > 0)
 	{
-		text = new png_text[comments.size()];
+		text = new png_text[tags->count()];
-		memset(text, 0, comments.size() * sizeof(png_text));
+		memset(text, 0, tags->count() * sizeof(png_text));
 		int n = 0;
-		foreach (i, comments)
+		foreach (i, *tags)
 		{
 			text[n].compression = PNG_TEXT_COMPRESSION_NONE;
-			text[n].key = const_cast<char*> (comments[i].key.str());
+			text[n].key = const_cast<char*> ((*tags)[i].key.str());
-			text[n].text = const_cast<char*> (comments[i].value.str());
+			text[n].text = const_cast<char*> ((*tags([i].value.str());
 			n++;
 		}
-		png_set_text(png_ptr, info_ptr, text, comments.size());
+		png_set_text(png_ptr, info_ptr, text, tags->count());
 	}
 
 	png_write_png(png_ptr, info_ptr,
@@ -1493,15 +1533,15 @@ bool nv::ImageIO::saveFloatEXR(const char * fileName, const FloatImage * fimage,
 
 	const char * channelNames[] = {"R", "G", "B", "A"};
 
-    Imf::Header header (w, h);
+	Imf::Header header (w, h);
 
 	for (uint c = 0; c < num_components; c++)
 	{
 		header.channels().insert(channelNames[c], Imf::Channel(Imf::FLOAT));
 	}
 
-    Imf::OutputFile file(fileName, header);
+	Imf::OutputFile file(fileName, header);
-    Imf::FrameBuffer frameBuffer;
+	Imf::FrameBuffer frameBuffer;
 
 	for (uint c = 0; c < num_components; c++)
 	{
@@ -1517,3 +1557,4 @@ bool nv::ImageIO::saveFloatEXR(const char * fileName, const FloatImage * fimage,
 
 #endif // defined(HAVE_OPENEXR)
 
+#endif // defined(HAVE_FREEIMAGE)

src/nvimage/ImageIO.h

@@ -16,43 +16,21 @@ namespace nv
 
 	namespace ImageIO
 	{
+		struct ImageMetaData
+		{
+			HashMap<String, String> tagMap;
+		};
+
 		NVIMAGE_API Image * load(const char * fileName);
 		NVIMAGE_API Image * load(const char * fileName, Stream & s);
 
 		NVIMAGE_API FloatImage * loadFloat(const char * fileName);
 		NVIMAGE_API FloatImage * loadFloat(const char * fileName, Stream & s);
 		
-		NVIMAGE_API bool save(const char * fileName, Stream & s, const Image * img);
+		NVIMAGE_API bool save(const char * fileName, Stream & s, const Image * img, const ImageMetaData * tags=NULL);
-		NVIMAGE_API bool save(const char * fileName, const Image * img);
+		NVIMAGE_API bool save(const char * fileName, const Image * img, const ImageMetaData * tags=NULL);
 		NVIMAGE_API bool saveFloat(const char * fileName, const FloatImage * fimage, uint base_component, uint num_components);
 
-		NVIMAGE_API Image * loadTGA(Stream & s);
-		NVIMAGE_API bool saveTGA(Stream & s, const Image * img);
-
-		NVIMAGE_API Image * loadPSD(Stream & s);
-
-#if defined(HAVE_PNG)
-		NVIMAGE_API Image * loadPNG(Stream & s);
-		typedef HashMap<String, String> PngCommentsMap;
-		NVIMAGE_API bool savePNG(Stream & s, const Image * img, const PngCommentsMap & comments = PngCommentsMap());
-#endif
-
-#if defined(HAVE_JPEG)
-		NVIMAGE_API Image * loadJPG(Stream & s);
-#endif
-
-#if defined(HAVE_TIFF)
-		NVIMAGE_API FloatImage * loadFloatTIFF(const char * fileName, Stream & s);
-		
-		NVIMAGE_API bool saveFloatTIFF(const char * fileName, const FloatImage * fimage, uint base_component, uint num_components);
-#endif
-
-#if defined(HAVE_OPENEXR)
-		NVIMAGE_API FloatImage * loadFloatEXR(const char * fileName, Stream & s);
-		
-		NVIMAGE_API bool saveFloatEXR(const char * fileName, const FloatImage * fimage, uint base_component, uint num_components);
-#endif
-
 	} // ImageIO namespace
 	
 } // nv namespace

src/nvtt/Texture.cpp

@@ -27,6 +27,7 @@
 #include <nvmath/Matrix.h>
 
 #include <nvimage/Filter.h>
+#include <nvimage/ImageIO.h>
 
 using namespace nv;
 using namespace nvtt;
@@ -126,8 +127,19 @@ void Texture::setNormalMap(bool isNormalMap)
 
 bool Texture::load(const char * fileName)
 {
-	// @@ Not implemented.
+	// @@ Add support for DDS textures!
-	return false;
+
+	AutoPtr<FloatImage> img(ImageIO::loadFloat(fileName));
+
+	if (img == NULL)
+	{
+		return false;
+	}
+
+	m->imageArray.resize(1);
+	m->imageArray[0] = img.release();
+
+	return true;
 }
 
 void Texture::setTexture2D(InputFormat format, int w, int h, int idx, void * data)
@@ -140,7 +152,7 @@ void Texture::resize(int w, int h, ResizeFilter filter)
 {
 	if (m->imageArray.count() > 0)
 	{
-		if (w == m->imageArray[0].width() && h == m->imageArray[0].height()) return;
+		if (w == m->imageArray[0]->width() && h == m->imageArray[0]->height()) return;
 	}
 
 	// @TODO: if cubemap, make sure w == h.
@@ -156,25 +168,25 @@ void Texture::resize(int w, int h, ResizeFilter filter)
 			if (filter == ResizeFilter_Box)
 			{
 				BoxFilter filter;
-				m->imageArray[i].resize(filter, w, h, wrapMode, 3);
+				m->imageArray[i]->resize(filter, w, h, wrapMode, 3);
 			}
 			else if (filter == ResizeFilter_Triangle)
 			{
 				TriangleFilter filter;
-				m->imageArray[i].resize(filter, w, h, wrapMode, 3);
+				m->imageArray[i]->resize(filter, w, h, wrapMode, 3);
 			}
 			else if (filter == ResizeFilter_Kaiser)
 			{
 				//KaiserFilter filter(inputOptions.kaiserWidth);
 				//filter.setParameters(inputOptions.kaiserAlpha, inputOptions.kaiserStretch);
 				KaiserFilter filter(3);
-				m->imageArray[i].resize(filter, w, h, wrapMode, 3);
+				m->imageArray[i]->resize(filter, w, h, wrapMode, 3);
 			}
 			else //if (filter == ResizeFilter_Mitchell)
 			{
 				nvDebugCheck(filter == ResizeFilter_Mitchell);
 				MitchellFilter filter;
-				m->imageArray[i].resize(filter, w, h, wrapMode, 3);
+				m->imageArray[i]->resize(filter, w, h, wrapMode, 3);
 			}
 		}
 		else
@@ -182,25 +194,25 @@ void Texture::resize(int w, int h, ResizeFilter filter)
 			if (filter == ResizeFilter_Box)
 			{
 				BoxFilter filter;
-				m->imageArray[i].resize(filter, w, h, wrapMode);
+				m->imageArray[i]->resize(filter, w, h, wrapMode);
 			}
 			else if (filter == ResizeFilter_Triangle)
 			{
 				TriangleFilter filter;
-				m->imageArray[i].resize(filter, w, h, wrapMode);
+				m->imageArray[i]->resize(filter, w, h, wrapMode);
 			}
 			else if (filter == ResizeFilter_Kaiser)
 			{
 				//KaiserFilter filter(inputOptions.kaiserWidth);
 				//filter.setParameters(inputOptions.kaiserAlpha, inputOptions.kaiserStretch);
 				KaiserFilter filter(3);
-				m->imageArray[i].resize(filter, w, h, wrapMode);
+				m->imageArray[i]->resize(filter, w, h, wrapMode);
 			}
 			else //if (filter == ResizeFilter_Mitchell)
 			{
 				nvDebugCheck(filter == ResizeFilter_Mitchell);
 				MitchellFilter filter;
-				m->imageArray[i].resize(filter, w, h, wrapMode);
+				m->imageArray[i]->resize(filter, w, h, wrapMode);
 			}
 		}
 	}
@@ -210,8 +222,8 @@ void Texture::resize(int maxExtent, RoundMode roundMode, ResizeFilter filter)
 {
 	if (m->imageArray.count() > 0)
 	{
-		int w = m->imageArray[0].width();
+		int w = m->imageArray[0]->width();
-		int h = m->imageArray[0].height();
+		int h = m->imageArray[0]->height();
 
 		nvDebugCheck(w > 0);
 		nvDebugCheck(h > 0);
@@ -255,8 +267,8 @@ bool Texture::buildNextMipmap(MipmapFilter filter)
 {
 	if (m->imageArray.count() > 0)
 	{
-		int w = m->imageArray[0].width();
+		int w = m->imageArray[0]->width();
-		int h = m->imageArray[0].height();
+		int h = m->imageArray[0]->height();
 
 		nvDebugCheck(w > 0);
 		nvDebugCheck(h > 0);
@@ -278,12 +290,12 @@ bool Texture::buildNextMipmap(MipmapFilter filter)
 			if (filter == MipmapFilter_Box)
 			{
 				BoxFilter filter;
-				m->imageArray[i].downSample(filter, wrapMode, 3);
+				m->imageArray[i]->downSample(filter, wrapMode, 3);
 			}
 			else if (filter == MipmapFilter_Triangle)
 			{
 				TriangleFilter filter;
-				m->imageArray[i].downSample(filter, wrapMode, 3);
+				m->imageArray[i]->downSample(filter, wrapMode, 3);
 			}
 			else if (filter == MipmapFilter_Kaiser)
 			{
@@ -291,19 +303,19 @@ bool Texture::buildNextMipmap(MipmapFilter filter)
 				//KaiserFilter filter(inputOptions.kaiserWidth);
 				//filter.setParameters(inputOptions.kaiserAlpha, inputOptions.kaiserStretch);
 				KaiserFilter filter(3);
-				m->imageArray[i].downSample(filter, wrapMode, 3);
+				m->imageArray[i]->downSample(filter, wrapMode, 3);
 			}
 		}
 		else
 		{
 			if (filter == MipmapFilter_Box)
 			{
-				m->imageArray[i].fastDownSample();
+				m->imageArray[i]->fastDownSample();
 			}
 			else if (filter == MipmapFilter_Triangle)
 			{
 				TriangleFilter filter;
-				m->imageArray[i].downSample(filter, wrapMode);
+				m->imageArray[i]->downSample(filter, wrapMode);
 			}
 			else //if (filter == MipmapFilter_Kaiser)
 			{
@@ -311,7 +323,7 @@ bool Texture::buildNextMipmap(MipmapFilter filter)
 				//KaiserFilter filter(inputOptions.kaiserWidth);
 				//filter.setParameters(inputOptions.kaiserAlpha, inputOptions.kaiserStretch);
 				KaiserFilter filter(3);
-				m->imageArray[i].downSample(filter, wrapMode);
+				m->imageArray[i]->downSample(filter, wrapMode);
 			}
 		}
 	}
@@ -328,7 +340,7 @@ void Texture::toLinear(float gamma)
 
 	foreach(i, m->imageArray)
 	{
-		m->imageArray[i].toLinear(0, 3, gamma);
+		m->imageArray[i]->toLinear(0, 3, gamma);
 	}
 }
 
@@ -340,7 +352,7 @@ void Texture::toGamma(float gamma)
 
 	foreach(i, m->imageArray)
 	{
-		m->imageArray[i].toGamma(0, 3, gamma);
+		m->imageArray[i]->toGamma(0, 3, gamma);
 	}
 }
 
@@ -358,7 +370,7 @@ void Texture::transform(const float w0[4], const float w1[4], const float w2[4],
 
 	foreach(i, m->imageArray)
 	{
-		m->imageArray[i].transform(0, xform, voffset);
+		m->imageArray[i]->transform(0, xform, voffset);
 	}
 }
 
@@ -370,7 +382,7 @@ void Texture::swizzle(int r, int g, int b, int a)
 
 	foreach(i, m->imageArray)
 	{
-		m->imageArray[i].swizzle(0, r, g, b, a);
+		m->imageArray[i]->swizzle(0, r, g, b, a);
 	}
 }
 
@@ -382,7 +394,7 @@ void Texture::scaleBias(int channel, float scale, float bias)
 
 	foreach(i, m->imageArray)
 	{
-		m->imageArray[i].scaleBias(channel, 1, scale, bias);
+		m->imageArray[i]->scaleBias(channel, 1, scale, bias);
 	}
 }
 
@@ -392,7 +404,7 @@ void Texture::normalizeNormals()
 
 	foreach(i, m->imageArray)
 	{
-		m->imageArray[i].normalize(0);
+		m->imageArray[i]->normalize(0);
 	}
 }
 

src/nvtt/Texture.h

@@ -28,6 +28,7 @@
 
 #include <nvcore/Containers.h>
 #include <nvcore/RefCounted.h>
+#include <nvcore/Ptr.h>
 
 #include <nvimage/Image.h>
 #include <nvimage/FloatImage.h>
@@ -59,7 +60,7 @@ namespace nvtt
 		AlphaMode alphaMode;
 		bool isNormalMap;
 
-		nv::Array<nv::FloatImage> imageArray;
+		nv::Array<nv::FloatImage *> imageArray;
 	};
 
 	

src/nvtt/cuda/CudaUtils.cpp

@@ -72,8 +72,10 @@ static bool isWow32()
 #endif
 */
 
+
 static bool isCudaDriverAvailable(int version)
 {
+#if defined HAVE_CUDA
 #if NV_OS_WIN32
 	Library nvcuda("nvcuda.dll");
 #else
@@ -109,11 +111,13 @@ static bool isCudaDriverAvailable(int version)
 
 		return driverVersion >= version;
 	}
+#endif // HAVE_CUDA
 
 	return false;
 }
 
 
+
 /// Determine if CUDA is available.
 bool nv::cuda::isHardwarePresent()
 {

src/nvtt/tests/imperativeapi.cpp

@@ -29,7 +29,10 @@
 int main(int argc, char *argv[])
 {
 	nvtt::CompressionOptions compressionOptions;
+	compressionOptions.setFormat(nvtt::Format_BC1);
+
 	nvtt::OutputOptions outputOptions;
+	outputOptions.setFileName("output.dds");
 
 	nvtt::Context context;
 	nvtt::Texture texture = context.createTexture();

src/nvtt/tools/decompress.cpp

@@ -179,16 +179,7 @@ int main(int argc, char *argv[])
 				return 1;
 			}
 			
-#ifdef HAVE_PNG
+			nv::ImageIO::save(name, stream, &mipmap);
-			if (savePNG)
-			{
-				nv::ImageIO::savePNG(stream, &mipmap);
-			}
-			else
-#endif
-			{
-				nv::ImageIO::saveTGA(stream, &mipmap);
-			}
 		}
 	}
 

src/nvtt/tools/resize.cpp

@@ -176,7 +176,7 @@ int main(int argc, char *argv[])
 	result->setFormat(nv::Image::Format_ARGB);
 
 	nv::StdOutputStream stream(output);
-	nv::ImageIO::saveTGA(stream, result.ptr());	// @@ Add generic save function. Add support for png too.
+	nv::ImageIO::save(output, stream, result.ptr());
 	
 	return 0;
 }

src/nvtt/tools/thumbnailer.cpp

@@ -119,9 +119,9 @@ int main(int argc, char *argv[])
 	nv::Image image;
 	if (!loadImage(image, input)) return 1;
 
-	nv::ImageIO::PngCommentsMap pngComments;
+	nv::ImageIO::ImageMetaData metaData;
-	pngComments.add("Thumb::Image::Width", nv::StringBuilder().number (image.width()));
+	metaData.tagMap.add("Thumb::Image::Width", nv::StringBuilder().number (image.width()));
-	pngComments.add("Thumb::Image::Height", nv::StringBuilder().number (image.height()));
+	metaData.tagMap.add("Thumb::Image::Height", nv::StringBuilder().number (image.height()));
 
 	if ((image.width() > size) || (image.height() > size))
 	{
@@ -145,12 +145,12 @@ int main(int argc, char *argv[])
 		result->setFormat(nv::Image::Format_ARGB);
 
 		nv::StdOutputStream stream(output);
-		nv::ImageIO::savePNG(stream, result.ptr(), pngComments);
+		nv::ImageIO::save(output, stream, result.ptr(), &metaData);
 	}
 	else
 	{
 		nv::StdOutputStream stream(output);
-		nv::ImageIO::savePNG(stream, &image, pngComments);
+		nv::ImageIO::save(output, stream, &image, &metaData);
 	}
 	
 	return 0;