ace-dent/kolibrios-gitea
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

rename 2 functions,

Browse Source 
add new function 'exif_get_tag_id'


git-svn-id: svn://kolibrios.org@6322 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA
2016-03-11 16:14:13 +00:00
parent 46c3e64a46
commit 174e0e1523
3 changed files with 140 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
programs/develop/libraries/exif/examples/viev_exif.asm
View File

@@ -10,7 +10,7 @@ include '../../../../load_img.inc'
include '../../../../develop/libraries/box_lib/trunk/box_lib.mac'
@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
caption db '<27><><EFBFBD>ᬮ<EFBFBD><E1ACAE> <20><><EFBFBD><EFBFBD>ଠ樨 Exif 10.03.16',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
caption db '<27><><EFBFBD>ᬮ<EFBFBD><E1ACAE> <20><><EFBFBD><EFBFBD>ଠ樨 Exif 11.03.16',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
run_file_70 FileInfoBlock
@@ -268,7 +268,7 @@ pushad
mov eax,1
mov ebx,1
.cycle_0:
stdcall [exif_get_app1_tag], h_app1,eax,txt_buf,80
stdcall [exif_get_tag], h_app1,eax,txt_buf,80
stdcall [buf2d_draw_text], buf_0, buf_1,txt_buf,3,ebx,0xb0
inc eax
add ebx,10
@@ -276,14 +276,14 @@ pushad
jne .cycle_0
;<3B><><EFBFBD><EFBFBD>뢠<EFBFBD><EBA2A0> <20><><EFBFBD><EFBFBD>୨<EFBFBD> ⥣<> <20><><EFBFBD> 0x8769
stdcall [exif_get_app1_child], h_app1,h_child,0x8769
stdcall [exif_get_child], h_app1,h_child,0x8769
cmp dword[h_child],0
je .no_found_child
mov eax,1
sub ebx,5
.cycle_1:
stdcall [exif_get_app1_tag], h_child,eax,txt_buf,80
stdcall [exif_get_tag], h_child,eax,txt_buf,80
stdcall [buf2d_draw_text], buf_0, buf_1,txt_buf,3,ebx,0xb00000
inc eax
add ebx,10
@@ -314,7 +314,7 @@ pushad
mov eax,1
mov ebx,1
.cycle_0:
stdcall [exif_get_app1_tag], h_app1,eax,txt_buf,80
stdcall [exif_get_tag], h_app1,eax,txt_buf,80
stdcall [buf2d_draw_text], buf_0, buf_1,txt_buf,3,ebx,0xb0
inc eax
add ebx,10
@@ -322,14 +322,14 @@ pushad
jne .cycle_0
;<3B><><EFBFBD><EFBFBD>뢠<EFBFBD><EBA2A0> <20><><EFBFBD><EFBFBD>୨<EFBFBD> ⥣<> <20><><EFBFBD> 0x8825
stdcall [exif_get_app1_child], h_app1,h_child,0x8825
stdcall [exif_get_child], h_app1,h_child,0x8825
cmp dword[h_child],0
je .no_found_child
mov eax,1
sub ebx,5
.cycle_1:
stdcall [exif_get_app1_tag], h_child,eax,txt_buf,80
stdcall [exif_get_tag], h_child,eax,txt_buf,80
stdcall [buf2d_draw_text], buf_0, buf_1,txt_buf,3,ebx,0xb00000
inc eax
add ebx,10
@@ -360,7 +360,7 @@ pushad
mov eax,1
mov ebx,1
.cycle_0:
stdcall [exif_get_app1_tag], h_app1,eax,txt_buf,80
stdcall [exif_get_tag], h_app1,eax,txt_buf,80
stdcall [buf2d_draw_text], buf_0, buf_1,txt_buf,3,ebx,0xb0
inc eax
add ebx,10
@@ -375,7 +375,7 @@ pushad
mov eax,1 ;25
sub ebx,5
.cycle_1:
stdcall [exif_get_app1_tag], h_child,eax,txt_buf,80
stdcall [exif_get_tag], h_child,eax,txt_buf,80
stdcall [buf2d_draw_text], buf_0, buf_1,txt_buf,3,ebx,0xb00000
inc eax
add ebx,10
@@ -403,27 +403,42 @@ pushad
cmp dword[open_file_size],0
je .open_file
mov eax,1
mov ebx,1
;<3B>뢮<EFBFBD><EBA2AE><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ଠ<EFBFBD><E0ACA0><EFBFBD> <20><> ᭨<><E1ADA8><EFBFBD>:
;0x010f - Manufacturer of digicam
;0x0110 - Model
;0x0132 - Modify date
mov ebx,3
stdcall [exif_get_tag_id], h_app1,0x010f,txt_buf,80
stdcall [buf2d_draw_text], buf_0, buf_1,txt_buf,3,ebx,0xb0
add ebx,10
stdcall [exif_get_tag_id], h_app1,0x0110,txt_buf,80
stdcall [buf2d_draw_text], buf_0, buf_1,txt_buf,3,ebx,0xb0
add ebx,10
stdcall [exif_get_tag_id], h_app1,0x0132,txt_buf,80
stdcall [buf2d_draw_text], buf_0, buf_1,txt_buf,3,ebx,0xb0
add ebx,20
;<3B><>室<EFBFBD><E5AEA4> app2
stdcall [exif_get_app2], h_app1,h_child
cmp dword[h_child],0
je .no_found_child
;<3B><><EFBFBD><EFBFBD>뢠<EFBFBD><EBA2A0> <20><><EFBFBD><EFBFBD>୨<EFBFBD> ⥣<>
stdcall [exif_get_app1_child], h_child,h_child,0x0011
;0x0011 - Preview IFD
stdcall [exif_get_child], h_child,h_child,0x0011
cmp dword[h_child],0
je .no_found_child
stdcall [exif_get_app1_child], h_child,h_child_siz,0x0202
;0x0202 - Preview Image Length
stdcall [exif_get_child], h_child,h_child_siz,0x0202
cmp dword[h_child_siz],0
je .no_found_child
stdcall [exif_get_app1_child], h_child,h_child,0x0201
;0x0201 - Preview Image Start
stdcall [exif_get_child], h_child,h_child,0x0201
cmp dword[h_child],0
je .no_found_child
;<3B><>।<EFBFBD><E0A5A4>塞 <20><><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD> <20> <20><>ॢ<EFBFBD><E0A5A2><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20>६<EFBFBD><E0A5AC><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ebx
stdcall [img_decode],dword[h_child],dword[h_child_siz],0
cmp dword[eax+4],1
jl .no_found_child
@@ -433,15 +448,16 @@ pushad
stdcall [buf2d_resize],buf_thumb,[eax+4],[eax+8],1
;<3B>८<EFBFBD>ࠧ㥬 <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD> <20> <20><>ଠ<EFBFBD><E0ACA0> rgb
stdcall [img_to_rgb2],ebx,[buf_thumb]
;㤠<>塞 <20>६<EFBFBD><E0A5AC><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ebx
stdcall [img_destroy],ebx
stdcall [img_destroy],ebx ;㤠<>塞 <20>६<EFBFBD><E0A5AC><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ebx
stdcall [buf2d_bit_blt], buf_0, 0,15, buf_thumb ;<3B><><EFBFBD>㥬 <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD>
stdcall [buf2d_draw_text], buf_0, buf_1,txt_thumb,3,3,0xb000
mov ebx,43
stdcall [buf2d_draw_text], buf_0, buf_1,txt_thumb,3,ebx,0xb000
add ebx,10
stdcall [buf2d_bit_blt], buf_0, 0,ebx, buf_thumb ;<3B><><EFBFBD>㥬 <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD>
jmp @f
.no_found_child:
stdcall [buf2d_draw_text], buf_0, buf_1,txt_nochild,3,3,0xb000
stdcall [buf2d_draw_text], buf_0, buf_1,txt_nochild,3,ebx,0xb000
jmp @f
.open_file:
stdcall [buf2d_draw_text], buf_0, buf_1,txt_openfile,3,3,0xb000
@@ -475,10 +491,10 @@ if 0 ;
cmp dword[h_child],0
je .end_save_file
;<3B><><EFBFBD><EFBFBD>뢠<EFBFBD><EBA2A0> <20><><EFBFBD><EFBFBD>୨<EFBFBD> ⥣<>
stdcall [exif_get_app1_child], h_child,h_child,0x0011
stdcall [exif_get_child], h_child,h_child,0x0011
cmp dword[h_child],0
je .end_save_file
stdcall [exif_get_app1_child], h_child,h_child,0x0201
stdcall [exif_get_child], h_child,h_child,0x0201
cmp dword[h_child],0
je .end_save_file
@@ -657,14 +673,18 @@ import_buf2d:
align 4
import_exif: ;<3B><><EFBFBD>ᠭ<EFBFBD><E1A0AD> <20><>ᯮ<EFBFBD><E1AFAE><EFBFBD><EFBFBD>㥬<EFBFBD><E3A5AC> <20>㭪権
exif_get_app1 dd sz_exif_get_app1
exif_get_app1_tag dd sz_exif_get_app1_tag
exif_get_app1_child dd sz_exif_get_app1_child
exif_get_app2 dd sz_exif_get_app2
exif_get_tag dd sz_exif_get_tag
exif_get_tag_id dd sz_exif_get_tag_id
exif_get_child dd sz_exif_get_child
dd 0,0
sz_exif_get_app1 db 'exif_get_app1',0
sz_exif_get_app1_tag db 'exif_get_app1_tag',0
sz_exif_get_app1_child db 'exif_get_app1_child',0
sz_exif_get_app2 db 'exif_get_app2',0
sz_exif_get_tag db 'exif_get_tag',0
sz_exif_get_tag_id db 'exif_get_tag_id',0
sz_exif_get_child db 'exif_get_child',0
sc system_colors