diff options
| author | Christos Zoulas <christos@zoulas.com> | 2021-10-12 18:02:16 +0000 |
|---|---|---|
| committer | Christos Zoulas <christos@zoulas.com> | 2021-10-12 18:02:16 +0000 |
| commit | fd2bb71b3b68a7ef84f1075a98544293a0862eb4 (patch) | |
| tree | 564f1ab611e092bb872e68f9343c104262d7661a | |
| parent | 885c380a317c93876bf535e7cb968bd165754d34 (diff) | |
| download | file-git-fd2bb71b3b68a7ef84f1075a98544293a0862eb4.tar.gz | |
Add strength back to netpbm
| -rw-r--r-- | magic/Magdir/images | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/magic/Magdir/images b/magic/Magdir/images index a229c889..0d04d7a6 100644 --- a/magic/Magdir/images +++ b/magic/Magdir/images @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: images,v 1.203 2021/09/23 13:59:02 christos Exp $ +# $File: images,v 1.204 2021/10/12 18:02:16 christos Exp $ # images: file(1) magic for image formats (see also "iff", and "c-lang" for # XPM bitmaps) # @@ -177,8 +177,7 @@ # URL: https://en.wikipedia.org/wiki/Netpbm # The next byte following the magic is always whitespace. # adding 65 to strength so that Netpbm images comes before "x86 boot sector" or -# "DOS/MBR boot sector" identified by ./filesystems is probably not needed -# because files are different +# "DOS/MBR boot sector" identified by ./filesystems 0 name netpbm >3 regex/s =[0-9]{1,50}\ [0-9]{1,50} Netpbm image data >>&0 regex =[0-9]{1,50} \b, size = %s x @@ -191,7 +190,7 @@ >>3 string !000000000 >>>0 use netpbm >>>0 string x \b, bitmap -#!:strength + 65 +!:strength + 65 !:mime image/x-portable-bitmap !:ext pbm # check for character # starting a comment line @@ -202,7 +201,7 @@ >0 regex/4 P2[\040\t\f\r\n] >>0 use netpbm >>0 string x \b, greymap -#!:strength + 65 +!:strength + 65 # american spelling gray !:mime image/x-portable-graymap !:ext pgm @@ -211,7 +210,7 @@ >0 regex/4 P3[\040\t\f\r\n] >>0 use netpbm >>0 string x \b, pixmap -#!:strength + 65 +!:strength + 65 !:mime image/x-portable-pixmap !:ext ppm @@ -219,7 +218,7 @@ >0 regex/4 P4[\040\t\f\r\n] >>0 use netpbm >>0 string x \b, rawbits, bitmap -#!:strength + 65 +!:strength + 65 !:mime image/x-portable-bitmap !:ext pbm @@ -227,7 +226,7 @@ >0 regex/4 P5[\040\t\f\r\n] >>0 use netpbm >>0 string x \b, rawbits, greymap -#!:strength + 65 +!:strength + 65 !:mime image/x-portable-greymap !:ext pgm @@ -235,7 +234,7 @@ >0 regex/4 P6[\040\t\f\r\n] >>0 use netpbm >>0 string x \b, rawbits, pixmap -#!:strength + 65 +!:strength + 65 !:mime image/x-portable-pixmap !:ext ppm/pnm @@ -249,6 +248,7 @@ >>3 search/256/b WIDTH Netpbm PAM image file, size = !:mime image/x-portable-arbitrarymap !:ext pam +!:strength + 65 >>>&1 string x %s >>>3 search/256/b HEIGHT x >>>>&1 string x %s |