Attachment 658134 Details for Bug 856092 – proposed patch

[patch] proposed patch

file-netpbm.patch (text/plain), 2.18 KB, created by Jan Kaluža on 2012-12-05 11:30:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kaluža

Created: 2012-12-05 11:30:05 UTC

Size: 2.18 KB

patch

obsolete

>diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
>index 4a1a337..d48e699 100644
>--- a/magic/Magdir/filesystems
>+++ b/magic/Magdir/filesystems
>@@ -61,7 +61,7 @@
> # for any allowed sector sizes
> 30		search/481	\x55\xAA	
> # to display x86 boot sector (40) before old one (strength=50), SYSLINUX MBR (?) and DOS BPB information (71) like in previous file version
>-!:strength +72
>+!:strength +40
> # for sector sizes < 512 Bytes
> >11		uleshort	<512		
> >>(11.s-2)	uleshort	0xAA55		x86 boot sector
>diff --git a/magic/Magdir/images b/magic/Magdir/images
>index e94905c..a25d292 100644
>--- a/magic/Magdir/images
>+++ b/magic/Magdir/images
>@@ -32,17 +32,42 @@
> 
> # PBMPLUS images
> # The next byte following the magic is always whitespace.
>-0	search/1	P1		Netpbm PBM image text
>+# strength is changed to try these patterns before "x86 boot sector"
>+0	search/1	P1		
>+>3	regex		=[0-9]*\ [0-9]*		Netpbm PBM image text
>+>3	regex		=[0-9]+\ 		\b, size = %sx
>+>>3	regex		=\ [0-9]+	\b%s
>+!:strength + 45
> !:mime	image/x-portable-bitmap
>-0	search/1b	P2		Netpbm PGM image text
>+0	search/1	P2		
>+>3	regex		=[0-9]*\ [0-9]*		Netpbm PGM image text
>+>3	regex		=[0-9]+\ 		\b, size = %sx
>+>>3	regex		=\ [0-9]+	\b%s
>+!:strength + 45
> !:mime	image/x-portable-greymap
> 0	search/1	P3		Netpbm PPM image text
>+>3	regex		=[0-9]*\ [0-9]*		Netpbm PPM image text
>+>3	regex		=[0-9]+\ 		\b, size = %sx
>+>>3	regex		=\ [0-9]+	\b%s
>+!:strength + 45
> !:mime	image/x-portable-pixmap
>-0	string		P4		Netpbm PBM "rawbits" image data
>+0	string		P4		
>+>3	regex		=[0-9]*\ [0-9]*		Netpbm PBM "rawbits" image data
>+>3	regex		=[0-9]+\ 		\b, size = %sx
>+>>3	regex		=\ [0-9]+	\b%s
>+!:strength + 45
> !:mime	image/x-portable-bitmap
>-0	string		P5		Netpbm PGM "rawbits" image data
>+0	string		P5		
>+>3	regex		=[0-9]*\ [0-9]*		Netpbm PGM "rawbits" image data
>+>3	regex		=[0-9]+\ 		\b, size = %sx
>+>>3	regex		=\ [0-9]+	\b%s
>+!:strength + 45
> !:mime	image/x-portable-greymap
>-0	string		P6		Netpbm PPM "rawbits" image data
>+0	string		P6		
>+>3	regex		=[0-9]*\ [0-9]*		Netpbm PPM "rawbits" image data
>+>3	regex		=[0-9]+\ 		\b, size = %sx
>+>>3	regex		=\ [0-9]+	\b%s
>+!:strength + 45
> !:mime	image/x-portable-pixmap
> 0	string		P7		Netpbm PAM image file
> !:mime	image/x-portable-pixmap

Actions: View | Diff

Attachments on bug 856092: 611684 | 657391 | 658134