Changeset 534 for trunk/src/image/png_loader.cc

Timestamp:

01/12/17 14:41:17 (8 years ago)

Author:

epyon

Message:

CONTINUED:

• getting rid of size_t
• datatypes now restricted to uint32 size
• 64-bit compatibility
• copyright updates where modified

File:

• trunk/src/image/png_loader.cc (modified) (6 diffs)

trunk/src/image/png_loader.cc

@@ -1 @@
-// Copyright (C) 2015-2015 ChaosForge Ltd
+// Copyright (C) 2015-2017 ChaosForge Ltd
 // http://chaosforge.org/
 //
@@ -251 +251 @@
         int remaining()
         {
-                return m_img_buffer_end - m_img_buffer;
+                return (int)( m_img_buffer_end - m_img_buffer );
         }
 
@@ -865 +865 @@
 
                 case STBI__PNG_TYPE( 'I', 'E', 'N', 'D' ): {
-                        uint32 raw_len, bpl;
+                        size_t raw_len;
+                        uint32 bpl;
                         if ( first ) return stbi__err( "first not IHDR", "Corrupt PNG" );
                         if ( scan != STBI__SCAN_load ) return 1;
@@ -882 +883 @@
                         else
                                 s->img_out_n = s->img_n;
-                        if ( !stbi__create_png_image( z, z->expanded, raw_len, s->img_out_n, depth, color, interlace ) ) return 0;
+                        if ( !stbi__create_png_image( z, z->expanded, int( raw_len ), s->img_out_n, depth, color, interlace ) ) return 0;
                         if ( has_trans )
                                 if ( !stbi__compute_transparency( z, tc, s->img_out_n ) ) return 0;
@@ -977 +978 @@
 static int stbi__stream_read( void *user, char *data, int size )
 {
-        return reinterpret_cast<stream*>( user )->read( data, 1, size );
+        return (int)reinterpret_cast<stream*>( user )->read( data, 1, size );
 }
 
@@ -1022 +1023 @@
         if ( stbi__png_info( &s, &x, &y, &comp ) == 1 )
         {
-                str.seek( pos, origin::SET );
+                str.seek( (long)pos, origin::SET );
                 format.type = UBYTE;
                 switch ( comp )