[Hdrflow-svn] SF.net SVN: hdrflow: [309] trunk/lib/openlibraries/src/openimagelib/plugins /sgi/sgi_plugin.cpp

[<gl...@us...>]

Revision: 309
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=309&view=rev
Author:   glslang
Date:     2007-09-22 01:30:17 -0700 (Sat, 22 Sep 2007)

Log Message:
-----------
+ maintenance cleanups

Modified Paths:
--------------
    trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp	2007-09-19 21:08:41 UTC (rev 308)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp	2007-09-22 08:30:17 UTC (rev 309)
@@ -28,9 +28,6 @@
 		std::vector<unsigned int> row_start;
 		std::vector<unsigned int> row_size;
 	};
-
-	void destroy( il::image_type* im )
-	{ delete im; }
 				
 	void convert_short( unsigned short* array, long length )
 	{
@@ -62,24 +59,19 @@
 
 	il::image_type_ptr sgi_image_type_to_image_type( int /*dimension*/, int channels, int width, int height )
 	{
-		typedef il::image<unsigned char, il::r8g8b8>	r8g8b8_image_type;
-		typedef il::image<unsigned char, il::r8g8b8a8>	r8g8b8a8_image_type;
-		typedef il::image<unsigned char, il::l8a8>		l8a8_image_type;
-		typedef il::image<unsigned char, il::l8>		l8_image_type;
-
 		switch( channels )
 		{
 			case 4:
-				return il::image_type_ptr( new il::image_type( r8g8b8a8_image_type( width, height, 1 ) ), destroy );
+				return il::allocate( L"r8g8b8a8", width, height );
 
 			case 3:
-				return il::image_type_ptr( new il::image_type( r8g8b8_image_type( width, height, 1 ) ), destroy );
+				return il::allocate( L"r8g8b8a8", width, height );
 
 			case 2:
-				return il::image_type_ptr( new il::image_type( l8a8_image_type( width, height, 1 ) ), destroy );
+				return il::allocate( L"l8a8", width, height );
 
 			case 1:
-				return il::image_type_ptr( new il::image_type( l8_image_type( width, height, 1 ) ), destroy );
+				return il::allocate( L"l8", width, height );
 
 			default:
 				break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.