WebSVN – Kolibri OS – Diff – /programs/develop/libraries/libs-dev/libimg/libimg.asm

     imul    ecx, [esi + Image.Height]
     mov eax, [esi + Image.Type]
     jmp dword [.handlers + (eax-1)*4]
 align 16
-.bpp8:
+.bpp8i:
-; 8 BPP -> 24 BPP
+; 8 BPP WITH PALETTE -> 24 BPP
     push    ebx
     mov ebx, [esi + Image.Palette]
     mov esi, [esi + Image.Data]
     sub ecx, 1
-    jz  .bpp8.last
+    jz  .bpp8i.last
 @@:
     movzx   eax, byte [esi]
     add esi, 1
     mov eax, [ebx + eax*4]
     mov [edi], eax
     add edi, 3
     sub ecx, 1
     jnz @b
-.bpp8.last:
+.bpp8i.last:
     movzx   eax, byte [esi]
     mov eax, [ebx + eax*4]
     mov [edi], ax
     shr eax, 16
     mov [edi+2], al
     pop ebx
+    ret
+align 16
+.bpp8g:
+; 8 BPP GRAYSCALE -> 24 BPP
+    mov esi, [esi + Image.Data]
+@@:
+    lodsb
+    mov ah, al
+    stosb
+    stosw
+    dec ecx
+    jnz @b
+    ret
+;
+;align 16
+;.bpp8a: ; considered application layer, may be changed in the future
+;; 8a BPP -> 24 BPP
+;    mov esi, [esi + Image.Data]
+;@@:
+;    lodsw
+;    mov ah, al
+;    stosb
+;    stosw
+;    dec ecx
+;    jnz @b
-    ret
+;    ret
 ; 15 BPP -> 24 BPP
 .bpp15.intel:
     push    ebx ebp
     add edi, [scanline_len]
     dec ecx
     jnz .next_line_horz1x
     jmp .exit
-.bpp8_horz:
+.bpp8ig_horz:
     dec edi
-  .next_line_horz8:
+  .next_line_horz8ig:
     push    ecx esi edi
     mov ecx, [scanline_len]
     pop edi esi ecx
     add esi, [scanline_len]
     add edi, [scanline_len]
     dec ecx
-    jnz .next_line_horz8
+    jnz .next_line_horz8ig
     jmp .exit
 .bpp24_horz:
     add eax, [ebx + Image.Data]
     mov [pixels_ptr], eax
     cmp [ebx + Image.Type], Image.bpp1
     jz  .rotate_ccw1
+    cmp [ebx + Image.Type], Image.bpp8i
+    jz  .rotate_ccw8ig
-    cmp [ebx + Image.Type], Image.bpp8
+    cmp [ebx + Image.Type], Image.bpp8g
-    jz  .rotate_ccw8
+    jz  .rotate_ccw8ig
     cmp [ebx + Image.Type], Image.bpp24
     jz  .rotate_ccw24
     cmp [ebx + Image.Type], Image.bpp32
     rep movsd
     pop ecx
     jmp .next_column_ccw_low
-.rotate_ccw8:
+.rotate_ccw8ig:
-  .next_column_ccw_low8:
+  .next_column_ccw_low8ig:
     dec ecx
     js  .exchange_dims
     mov ecx, edx
     and ecx, 3
     rep movsb
     pop ecx
-    jmp .next_column_ccw_low8
+    jmp .next_column_ccw_low8ig
 .rotate_ccw24:
   .next_column_ccw_low24:
     add eax, [ebx + Image.Data]
     mov [pixels_ptr], eax
     cmp [ebx + Image.Type], Image.bpp1
     jz  .rotate_cw1
+    cmp [ebx + Image.Type], Image.bpp8i
+    jz  .rotate_cw8ig
-    cmp [ebx + Image.Type], Image.bpp8
+    cmp [ebx + Image.Type], Image.bpp8g
-    jz  .rotate_cw8
+    jz  .rotate_cw8ig
     cmp [ebx + Image.Type], Image.bpp24
     jz  .rotate_cw24
     cmp [ebx + Image.Type], Image.bpp32
     rep movsd
     pop ecx
     jmp .next_column_cw_low
-.rotate_cw8:
+.rotate_cw8ig:
-  .next_column_cw_low8:
+  .next_column_cw_low8ig:
     dec ecx
     js  .exchange_dims
     mov ecx, eax
     and ecx, 3
     rep movsb
     pop ecx
-    jmp .next_column_cw_low8
+    jmp .next_column_cw_low8ig
 .rotate_cw24:
   .next_column_cw_low24:
   .jpg  dd LIBIMG_FORMAT_ID_JPEG, img.is.jpg,  img.decode.jpg,     img.encode.jpg, 0
   .tga  dd LIBIMG_FORMAT_ID_TGA,  img.is.tga,  img.decode.tga,     img.encode.tga, 0
   .pcx  dd LIBIMG_FORMAT_ID_PCX,  img.is.pcx,  img.decode.pcx,     img.encode.pcx, 0
   .xcf  dd LIBIMG_FORMAT_ID_XCF,  img.is.xcf,  img.decode.xcf,     img.encode.xcf, 0
   .tiff dd LIBIMG_FORMAT_ID_TIFF, img.is.tiff, img.decode.tiff,    img.encode.tiff,0
-  .pnm  dd LIBIMG_FORMAT_ID_PNM,  img.is.pnm,  img.decode.pnm,     img.encode.pnm, 1 + (1 SHL Image.bpp1) + (1 SHL Image.bpp8) + (1 SHL Image.bpp24)
+  .pnm  dd LIBIMG_FORMAT_ID_PNM,  img.is.pnm,  img.decode.pnm,     img.encode.pnm, 1 + (1 SHL Image.bpp1) + (1 SHL Image.bpp8g) + (1 SHL Image.bpp24)
   .wbmp dd LIBIMG_FORMAT_ID_WBMP, img.is.wbmp, img.decode.wbmp,    img.encode.wbmp,0
   .z80  dd LIBIMG_FORMAT_ID_Z80,  img.is.z80,  img.decode.z80,     img.encode.z80, 0 ;this must be the last entry as there are no signatures in z80 screens at all
         dd 0
 ; do not allow images which require too many memory
     cmp eax, 4000000h
     jae .error
     cmp [ebx + Image.Type], Image.bpp1
     jz  .bpp1
-    cmp [ebx + Image.Type], Image.bpp8
+    cmp [ebx + Image.Type], Image.bpp8i
+    jz  .bpp8i
+    cmp [ebx + Image.Type], Image.bpp8g
+    jz  .bpp8g
+    cmp [ebx + Image.Type], Image.bpp8a
-    jz  .bpp8
+    jz  .bpp8a
     cmp [ebx + Image.Type], Image.bpp24
     jz  .bpp24
 .bpp32:
     shl eax, 2
     jmp @f
 .bpp24:
     lea eax, [eax*3]
     jmp @f
-.bpp8:
+.bpp8i:
     add eax, 256*4  ; for palette
+.bpp8g:
+    jmp @f
+.bpp8a:
+    shl eax, 1
     jmp @f
 .bpp1:
     mov eax, [_width]
     add eax, 7
     shr eax, 3
     mov [ebx + Image.Data], eax
     push    [_width]
     pop [ebx + Image.Width]
     push    [_height]
     pop [ebx + Image.Height]
-    cmp [ebx + Image.Type], Image.bpp8
+    cmp [ebx + Image.Type], Image.bpp8i
     jnz @f
     lea esi, [eax + esi - 256*4]
     mov [ebx + Image.Palette], esi
     jmp .ret
 @@:
 ;;------------------------------------------------------------------------------------------------;;
 ;< --- TBD ---                                                                                    ;;
 ;;================================================================================================;;
     cmp [ebx + Image.Type], Image.bpp1
     jz  .bpp1.1
-    cmp [ebx + Image.Type], Image.bpp8
+    cmp [ebx + Image.Type], Image.bpp8i
     jz  .bpp8.1
+    cmp [ebx + Image.Type], Image.bpp8g
+    jz  .bpp8.1
+    cmp [ebx + Image.Type], Image.bpp8a
+    jz  .bpp8a.1
     cmp [ebx + Image.Type], Image.bpp24
     jz  .bpp24.1
     add eax, eax
     cmp [ebx + Image.Type], Image.bpp32
     jnz .quit
     lea eax, [eax*3]
     jmp .quit
 .bpp1.1:
     add eax, 7
     shr eax, 3
+    jmp .quit
+.bpp8a.1:
+    shl eax, 1
 .bpp8.1:
 .quit:
     ret
 ;;================================================================================================;;
 ;;////////////////////////////////////////////////////////////////////////////////////////////////;;
 ;;================================================================================================;;
 align 4
-type2bpp    dd  8, 24, 32, 15, 16, 1
+type2bpp    dd  8, 24, 32, 15, 16, 1, 9 ;,16
 img._.do_rgb.handlers:
-    dd  img._.do_rgb.bpp8
+    dd  img._.do_rgb.bpp8i
     dd  img._.do_rgb.bpp24
     dd  img._.do_rgb.bpp32
     dd  img._.do_rgb.bpp15.amd  ; can be overwritten in lib_init
     dd  img._.do_rgb.bpp16.amd  ; can be overwritten in lib_init
+    dd  img._.do_rgb.bpp1
+    dd  img._.do_rgb.bpp8g
-    dd  img._.do_rgb.bpp1
+;    dd  img._.do_rgb.bpp8a
 img.flip.layer.handlers_horz:
-    dd  img.flip.layer.bpp8_horz
+    dd  img.flip.layer.bpp8ig_horz
     dd  img.flip.layer.bpp24_horz
     dd  img.flip.layer.bpp32_horz
     dd  img.flip.layer.bpp1x_horz
+    dd  img.flip.layer.bpp1x_horz
+    dd  img.flip.layer.bpp1_horz
-    dd  img.flip.layer.bpp1x_horz
+    dd  img.flip.layer.bpp8ig_horz
-    dd  img.flip.layer.bpp1_horz
+;    dd  img.flip.layer.bpp8a_horz
 ;;================================================================================================;;

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/libs-dev/libimg/libimg.asm – Rev 2692 → 2733