Index: trunk/src/image/png_loader.cc
===================================================================
--- trunk/src/image/png_loader.cc	(revision 534)
+++ trunk/src/image/png_loader.cc	(revision 535)
@@ -1015,5 +1015,5 @@
 png_loader::png_loader() {}
 
-bool nv::png_loader::get_info( stream& str, image_format& format, ivec2& size )
+bool nv::png_loader::get_info( stream& str, pixel_format& format, ivec2& size )
 {
 	size_t pos = str.tell();
@@ -1024,11 +1024,10 @@
 	{
 		str.seek( (long)pos, origin::SET );
-		format.type = UBYTE;
 		switch ( comp )
 		{
 		case 0: return false;
-		case 1: format.format = RED; break;
-		case 3: format.format = RGB; break;
-		case 4: format.format = RGBA; break;
+		case 1: format = R8; break;
+		case 3: format = RGB8; break;
+		case 4: format = RGBA8; break;
 		default: return false;
 		}
@@ -1057,12 +1056,11 @@
 		// need to 'unget' all the characters in the IO buffer
 		s.seek( -ctx.remaining(), origin::CUR );
-		image_format format;
+		pixel_format format;
 		ivec2 size;
-		format.type = UBYTE;
 		switch ( comp )
 		{
-		case 1: format.format = RED; break;
-		case 3: format.format = RGB; break;
-		case 4: format.format = RGBA; break;
+		case 1: format = R8; break;
+		case 3: format = RGB8; break;
+		case 4: format = RGBA8; break;
 		default: return nullptr;
 		}
@@ -1073,13 +1071,12 @@
 }
 
-image_data* nv::png_loader::load( stream& s, image_format format )
-{
-	NV_ASSERT( format.type == UBYTE, "!" );
+image_data* nv::png_loader::load( stream& s, pixel_format format )
+{
 	int rcomp = 0;
-	switch ( format.format )
-	{
-	case RED: rcomp = 1; break;
-	case RGB: rcomp = 3; break;
-	case RGBA: rcomp = 4; break;
+	switch ( format )
+	{
+	case R8: rcomp = 1; break;
+	case RGB8: rcomp = 3; break;
+	case RGBA8: rcomp = 4; break;
 	default: NV_ASSERT( false, "bad format requested!" ); return nullptr;
 	}
@@ -1091,12 +1088,11 @@
 	{
 		s.seek( -ctx.remaining(), origin::CUR );
-		image_format fmt;
+		pixel_format fmt;
 		ivec2 sz;
-		fmt.type = UBYTE;
 		switch ( comp )
 		{
-		case 1: fmt.format = RED; break;
-		case 3: fmt.format = RGB; break;
-		case 4: fmt.format = RGBA; break;
+		case 1: fmt = R8; break;
+		case 3: fmt = RGB8; break;
+		case 4: fmt = RGBA8; break;
 		default: NV_ASSERT( false, "UNKNOWN RESULT!" );
 		}