WebSVN – Kolibri OS – Diff – /programs/develop/libraries/exif/trunk/exif.asm

 tag_format_f4b	 equ 11 ;float 4 byte
 tag_format_f8b	 equ 12 ;float 8 byte
 align 4
+txt_dp db ': ',0
-txt_dp db ': ',0
+txt_zap db ', ',0
 txt_div db '/',0
+;
 db 0x87,0x82,'T88 options',0
 db 0x87,0xac,'Image layer',0
 db 0x87,0xaf,'Geo tiff directory',0
 db 0x87,0xb0,'Geo tiff double params',0
 db 0x87,0xb1,'Geo tiff ascii params',0
+db 0x88,0x25,'GPS info',0
 db 0x88,0x28,'Opto-Electric conv factor',0
 db 0x88,0x29,'Interlace',0
 db 0x88,0x5c,'Fax recv params',0
 db 0x88,0x5d,'Fax sub address',0
 db 0x88,0x5e,'Fax recv time',0
 db 0x02,0xbc,'Application notes',0
 db 0x82,0x9a,'Exposure time',0
 db 0x82,0x9d,'F number',0
 db 0x88,0x22,'Exposure program',0
 db 0x88,0x24,'Spectral sensitivity',0
-db 0x88,0x25,'GPS info',0
 db 0x88,0x27,'ISO',0
 db 0x88,0x2a,'Time zone offset',0
 db 0x88,0x2b,'Self timer mode',0
 db 0x88,0x30,'Sensitivity type',0
 db 0x88,0x31,'Standard output sensitivity',0
 	.end_f:
 popad
 	ret
 endp
+;output:
+; app2 - ãª § â¥«ì    ç «® exif.app2 (¨«¨ 0 ¥á«¨ ¥  ©¤¥® ¨«¨ ä®à¬ â ä ©«  ¥ ¯®¤¤¥à¦¨¢ ¥âáï)
+align 4
+proc exif_get_app2, app1:dword, app2:dword
+pushad
+	mov eax,[app1]
+	cmp [eax],edx
+	je .no_suport ;¥á«¨ ¥  ©¤¥ ãª § â¥«ì    ç «® exif.app1
+	mov edi,[app2]
+	movzx edx,word[eax+offs_m_or_i] ;if 'MM' edx=1
+	; ç «® ¯®¨áª  ¯à®¨§¢®¤¨â¥«ï ª ¬¥àë
+	mov ebx,0x010f
+	bt edx,0
+	jnc @f
+		ror bx,8
+	@@:
+	;¯à®¢¥àï¥¬ ç¨á«® â¥£®¢
+	mov eax,[eax]
+	movzx ecx,word[eax]
+	bt edx,0
+	jnc @f
+		ror cx,8
+	@@:
+	cmp ecx,1
+	jl .no_suport ;¥á«¨ ç¨á«® â¥£®¢ <1
+	;¯¥à¥å®¤¨¬   1-© â¥£
+	add eax,offs_tag_0
+	@@:
+		cmp word[eax],bx
+		je @f
+		add eax,tag_size
+		loop @b
+	jmp .no_suport ;¥á«¨ ¥  ©¤¥®
+	@@: ;¥á«¨  ©¤¥®
+		mov ebx,dword[eax+4]
+		bt edx,0
+		jnc @f
+			ror bx,8
+			ror ebx,16
+			ror bx,8
+		@@:
+		cmp ebx,4
+		jle .no_suport ; §¢ ¨¥ ¯à®¨§¢®¤¨â¥«ï ¬¥ìè¥ 4 á¨¬¢®«®¢, ¥ ¯®¤¤¥à¦¨ ¢ ¥âáï
+		mov ebx,dword[eax+8]
+		bt edx,0
+		jnc @f
+			ror bx,8
+			ror ebx,16
+			ror bx,8
+		@@:
+	;¯à®¢¥àª  ¯®¤¤¥à¦¨¢ ¥¬ëå ¯à®¨§¢®¤¨â¥«¥©
+	mov eax,[app1]
+	add ebx,[eax+4]
+	cmp dword[ebx],'Cano'
+	je .suport
+	cmp dword[ebx],'NIKO'
+	je .suport
+	cmp dword[ebx],'Pana'
+	je .suport
+	;¢á¥ ®áâ «ìë¥ ¥ ¯®¤¤¥à¦¨¢ îâáï
+	jmp .no_suport
+	.suport:
+	; å®¤¨¬ â¥£ 0x8769 (à áè¨à¥ë¥ ¤ ë¥ ¯® Exif)
+	stdcall exif_get_app1_child, eax,edi,0x8769
+	cmp dword[edi],0
+	je .no_suport
+	; å®¤¨¬ â¥£ 0xa005 (¤ ë¥ Maker ¯® ª ¬¥à¥)
+	stdcall exif_get_app1_child, edi,edi, 0x927c
+	cmp dword[edi],0
+	je .no_suport
+	cmp dword[ebx],'NIKO'
+	jne @f
+		add dword[edi],18 ;for Nikon
+	@@:
+	cmp dword[ebx],'Pana'
+	jne @f
+		add dword[edi],12 ;for Panasonic
+	@@:
+	jmp @f
+	.no_suport:
+		mov dword[edi],0
+	@@:
+popad
+	ret
+endp
 ;description:
 ; ¢á¯®¬®£ â¥«ì ï äãªæ¨ï ¤«ï çâ¥¨ï  § ç¥¨© â¥£®¢
 ;input:
 ; eax - ãª § â¥«ì  ç «  â¥£
 	;ª®¯¨àã¥¬ áâà®ªã á  §¢ ¨¥¬ â¥£
 	add esi,2
 	stdcall str_n_cat,edi,esi,[t_max]
-	jmp @f
+	jmp .start_read
 	.tag_unknown:
+		;¥á«¨ â¥£ ¥  ©¤¥ áâ ¢¨¬ ¥£® ª®¤ ¢¬¥áâ®  §¢ ¨ï
+		movzx ebx,word[eax]
+		bt edx,0
+		jnc @f
-		;¥á«¨ â¥£ ¥  ©¤¥ áâ ¢¨¬ ¥£® ª®¤ ¢¬¥áâ®  §¢ ¨ï
+			ror bx,8
-		movzx ebx,word[eax]
+		@@:
 		stdcall hex_in_str, edi, ebx,4
 		mov byte[edi+4],0
-	@@:
+	.start_read:
 	;ç¨â ¥¬ ¨ä®à¬ æ¨î ¢ â¥£¥
 	@@:
 	cmp word[eax+2],bx
 	jne .tag_01
 		stdcall str_n_cat,edi,txt_dp,[t_max]
 		call get_tag_data_size
-		cmp ebx,1
+		cmp ebx,4
 		jg .over4b_01
+		cmp ebx,1
+		je @f
+			or edx,2 ;array data
+			mov ecx,dword[eax+8]
+			mov dh,bl
+		@@:
-			;¥á«¨ ®¤® 1 ¡ ©â®¢®¥ ç¨á«®
+			;¥á«¨ 1 ®¤® ¡ ©â®¢®¥ ç¨á«®
 			movzx ebx,byte[eax+8]
-			;bt edx,0
-			;jnc @f
-			;	ror bx,8
-			;@@:
 			stdcall str_len,edi
 			add edi,eax
 			mov eax,ebx
 			call convert_int_to_str ;[t_max]
+			bt edx,1
+			jnc .end_f
+			@@:
+				;¥á«¨ ®â 2 ¤® 4 ®¤® ¡ ©â®¢ëå ç¨á¥«
+				dec dh
+				cmp dh,0
+				je .end_f
+				shr ecx,8
+				stdcall str_n_cat,edi,txt_zap,[t_max]
+				stdcall str_len,edi
+				add edi,eax
+				movzx eax,cl
+				call convert_int_to_str ;[t_max]
+				jmp @b
 		.over4b_01:
 			;...
 		jmp .end_f
 	.tag_01:
 	@@:
 	cmp word[eax+2],bx
 	jne .tag_03
 		stdcall str_n_cat,edi,txt_dp,[t_max]
 		call get_tag_data_size
-		cmp ebx,1
+		cmp ebx,2
 		jg .over4b_03
+		jne @f
+			;¥á«¨ ¤¢  2 ¡ ©â®¢ëå ç¨á«
+			or edx,2 ;array data
+			movzx ecx,word[eax+10]
+			bt edx,0
+			jnc @f
+				ror cx,8
+			@@:
 			;¥á«¨ ®¤® 2 ¡ ©â®¢®¥ ç¨á«®
 			movzx ebx,word[eax+8]
 			bt edx,0
 			jnc @f
 				ror bx,8
 			@@:
 			stdcall str_len,edi
 			add edi,eax
 			mov eax,ebx
 			call convert_int_to_str ;[t_max]
+			bt edx,1 ;array ?
+			jnc .end_f
+			;¤®¡ ¢«ï¥¬ 2-¥ ç¨á«®
+			stdcall str_n_cat,edi,txt_zap,[t_max]
+			stdcall str_len,edi
+			add edi,eax
+			mov eax,ecx
+			call convert_int_to_str ;[t_max]
 		.over4b_03:
 			;...
 		jmp .end_f
 	.tag_03:
 align 16
 EXPORTS:
 	dd sz_exif_get_app1, exif_get_app1
 	dd sz_exif_get_app1_tag, exif_get_app1_tag
 	dd sz_exif_get_app1_child, exif_get_app1_child
+	dd sz_exif_get_app2, exif_get_app2
 	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

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/exif/trunk/exif.asm – Rev 5008 → 5009