Просмотр исходного кода

Made superstrict.
Un-deprecated - stb image doesn't seem to handle bmps well.

woollybah 7 лет назад
Родитель
Сommit
0f99386d38
1 измененных файлов с 5 добавлено и 7 удалено
  1. 5 7
      bmploader.mod/bmploader.bmx

+ 5 - 7
bmploader.mod/bmploader.bmx

@@ -1,5 +1,5 @@
 
 
-Strict
+SuperStrict
 
 
 Rem
 Rem
 bbdoc: Graphics/BMP loader
 bbdoc: Graphics/BMP loader
@@ -23,7 +23,6 @@ ModuleInfo "History: Fixed palettized bitmaps failing when biClrUsed=0"
 
 
 Import BRL.StbImageLoader
 Import BRL.StbImageLoader
 
 
-?deprecated
 Import BRL.Pixmap
 Import BRL.Pixmap
 Import BRL.EndianStream
 Import BRL.EndianStream
 
 
@@ -35,10 +34,10 @@ Type TPixmapLoaderBMP Extends TPixmapLoader
 				
 				
 		Local	line:Int[],palette:Int[],pix:Byte[],buf:Byte[64]
 		Local	line:Int[],palette:Int[],pix:Byte[],buf:Byte[64]
 		Local	pixmap:TPixmap
 		Local	pixmap:TPixmap
-		Local	hsize,hoffset,pad
-		Local	size,width,height
-		Local	planes,bits,compression,isize,xpels,ypels,COLS,inuse
-		Local	w,x,y,c0,c1,p
+		Local	hsize:Int,hoffset:Int,pad:Int
+		Local	size:Int,width:Int,height:Int
+		Local	planes:Int,bits:Int,compression:Int,isize:Int,xpels:Int,ypels:Int,COLS:Int,inuse:Int
+		Local	w:Int,x:Int,y:Int,c0:Int,c1:Int,p:Int
 
 
 		If stream.ReadBytes( buf,2 )=2
 		If stream.ReadBytes( buf,2 )=2
 			If buf[0]=Asc("B") And buf[1]=Asc("M")			
 			If buf[0]=Asc("B") And buf[1]=Asc("M")			
@@ -134,4 +133,3 @@ Type TPixmapLoaderBMP Extends TPixmapLoader
 End Type
 End Type
 
 
 New TPixmapLoaderBMP
 New TPixmapLoaderBMP
-?