From 873ec1bb5f7636c8c32cb34e9990a7849072a71e Mon Sep 17 00:00:00 2001 From: Mirco Miranda Date: Thu, 16 Jan 2025 23:03:37 +0000 Subject: [PATCH] More metadata read tests Adds some metadata/read resolution tests without adding new images. --- autotests/read/exr/rgb-gimp.exr.json | 9 +++++++++ autotests/read/hdr/orientation1.hdr.json | 8 +++++++- autotests/read/hdr/orientation2.hdr.json | 8 +++++++- autotests/read/hdr/orientation3.hdr.json | 8 +++++++- autotests/read/hdr/orientation4.hdr.json | 8 +++++++- autotests/read/hdr/orientation5.hdr.json | 8 +++++++- autotests/read/hdr/orientation6.hdr.json | 8 +++++++- autotests/read/hdr/orientation7.hdr.json | 8 +++++++- autotests/read/hdr/orientation8.hdr.json | 8 +++++++- autotests/read/jxr/testcard_cmyk8.jxr.json | 6 +++++- autotests/read/pcx/ICONDOC.pcx.json | 9 +++++++++ .../RAW_KODAK_C330_FORMAT_NONE_YRGB.raw.json | 19 +++++++++++++++++++ autotests/read/sct/cmyk.sct.json | 6 +++++- autotests/read/xcf/birthday16.xcf.json | 6 +++++- autotests/read/xcf/birthday32.xcf.json | 6 +++++- .../read/xcf/bug_476755_rgb_layers.xcf.json | 15 +++++++++++++++ 16 files changed, 128 insertions(+), 12 deletions(-) create mode 100644 autotests/read/exr/rgb-gimp.exr.json create mode 100644 autotests/read/pcx/ICONDOC.pcx.json create mode 100644 autotests/read/raw/RAW_KODAK_C330_FORMAT_NONE_YRGB.raw.json create mode 100644 autotests/read/xcf/bug_476755_rgb_layers.xcf.json diff --git a/autotests/read/exr/rgb-gimp.exr.json b/autotests/read/exr/rgb-gimp.exr.json new file mode 100644 index 0000000..279f25d --- /dev/null +++ b/autotests/read/exr/rgb-gimp.exr.json @@ -0,0 +1,9 @@ +[ + { + "fileName" : "rgb-gimp.png", + "resolution" : { + "dotsPerMeterX" : 3937, + "dotsPerMeterY" : 3937 + } + } +] diff --git a/autotests/read/hdr/orientation1.hdr.json b/autotests/read/hdr/orientation1.hdr.json index c052e86..17c883a 100644 --- a/autotests/read/hdr/orientation1.hdr.json +++ b/autotests/read/hdr/orientation1.hdr.json @@ -1,5 +1,11 @@ [ { - "fileName" : "orientation_all.png" + "fileName" : "orientation_all.png", + "metadata" : [ + { + "key" : "Software" , + "value" : "GEGL" + } + ] } ] diff --git a/autotests/read/hdr/orientation2.hdr.json b/autotests/read/hdr/orientation2.hdr.json index c052e86..17c883a 100644 --- a/autotests/read/hdr/orientation2.hdr.json +++ b/autotests/read/hdr/orientation2.hdr.json @@ -1,5 +1,11 @@ [ { - "fileName" : "orientation_all.png" + "fileName" : "orientation_all.png", + "metadata" : [ + { + "key" : "Software" , + "value" : "GEGL" + } + ] } ] diff --git a/autotests/read/hdr/orientation3.hdr.json b/autotests/read/hdr/orientation3.hdr.json index c052e86..17c883a 100644 --- a/autotests/read/hdr/orientation3.hdr.json +++ b/autotests/read/hdr/orientation3.hdr.json @@ -1,5 +1,11 @@ [ { - "fileName" : "orientation_all.png" + "fileName" : "orientation_all.png", + "metadata" : [ + { + "key" : "Software" , + "value" : "GEGL" + } + ] } ] diff --git a/autotests/read/hdr/orientation4.hdr.json b/autotests/read/hdr/orientation4.hdr.json index c052e86..17c883a 100644 --- a/autotests/read/hdr/orientation4.hdr.json +++ b/autotests/read/hdr/orientation4.hdr.json @@ -1,5 +1,11 @@ [ { - "fileName" : "orientation_all.png" + "fileName" : "orientation_all.png", + "metadata" : [ + { + "key" : "Software" , + "value" : "GEGL" + } + ] } ] diff --git a/autotests/read/hdr/orientation5.hdr.json b/autotests/read/hdr/orientation5.hdr.json index c052e86..17c883a 100644 --- a/autotests/read/hdr/orientation5.hdr.json +++ b/autotests/read/hdr/orientation5.hdr.json @@ -1,5 +1,11 @@ [ { - "fileName" : "orientation_all.png" + "fileName" : "orientation_all.png", + "metadata" : [ + { + "key" : "Software" , + "value" : "GEGL" + } + ] } ] diff --git a/autotests/read/hdr/orientation6.hdr.json b/autotests/read/hdr/orientation6.hdr.json index c052e86..17c883a 100644 --- a/autotests/read/hdr/orientation6.hdr.json +++ b/autotests/read/hdr/orientation6.hdr.json @@ -1,5 +1,11 @@ [ { - "fileName" : "orientation_all.png" + "fileName" : "orientation_all.png", + "metadata" : [ + { + "key" : "Software" , + "value" : "GEGL" + } + ] } ] diff --git a/autotests/read/hdr/orientation7.hdr.json b/autotests/read/hdr/orientation7.hdr.json index c052e86..17c883a 100644 --- a/autotests/read/hdr/orientation7.hdr.json +++ b/autotests/read/hdr/orientation7.hdr.json @@ -1,5 +1,11 @@ [ { - "fileName" : "orientation_all.png" + "fileName" : "orientation_all.png", + "metadata" : [ + { + "key" : "Software" , + "value" : "GEGL" + } + ] } ] diff --git a/autotests/read/hdr/orientation8.hdr.json b/autotests/read/hdr/orientation8.hdr.json index c052e86..17c883a 100644 --- a/autotests/read/hdr/orientation8.hdr.json +++ b/autotests/read/hdr/orientation8.hdr.json @@ -1,5 +1,11 @@ [ { - "fileName" : "orientation_all.png" + "fileName" : "orientation_all.png", + "metadata" : [ + { + "key" : "Software" , + "value" : "GEGL" + } + ] } ] diff --git a/autotests/read/jxr/testcard_cmyk8.jxr.json b/autotests/read/jxr/testcard_cmyk8.jxr.json index 6bfdf15..5ca8feb 100644 --- a/autotests/read/jxr/testcard_cmyk8.jxr.json +++ b/autotests/read/jxr/testcard_cmyk8.jxr.json @@ -1,7 +1,11 @@ [ { "minQtVersion" : "6.8.0", - "fileName" : "testcard_cmyk8.tif" + "fileName" : "testcard_cmyk8.tif", + "resolution" : { + "dotsPerMeterX" : 3780, + "dotsPerMeterY" : 3780 + } }, { "maxQtVersion" : "6.7.99", diff --git a/autotests/read/pcx/ICONDOC.pcx.json b/autotests/read/pcx/ICONDOC.pcx.json new file mode 100644 index 0000000..95c6526 --- /dev/null +++ b/autotests/read/pcx/ICONDOC.pcx.json @@ -0,0 +1,9 @@ +[ + { + "fileName" : "ICONDOC.png", + "resolution" : { + "dotsPerMeterX" : 25197, + "dotsPerMeterY" : 13780 + } + } +] diff --git a/autotests/read/raw/RAW_KODAK_C330_FORMAT_NONE_YRGB.raw.json b/autotests/read/raw/RAW_KODAK_C330_FORMAT_NONE_YRGB.raw.json new file mode 100644 index 0000000..087a73a --- /dev/null +++ b/autotests/read/raw/RAW_KODAK_C330_FORMAT_NONE_YRGB.raw.json @@ -0,0 +1,19 @@ +[ + { + "fileName" : "RAW_KODAK_C330_FORMAT_NONE_YRGB.png", + "metadata" : [ + { + "key" : "Manufacturer", + "value" : "Kodak" + }, + { + "key" : "Model" , + "value" : "C330" + } + ], + "resolution" : { + "dotsPerMeterX" : 3937, + "dotsPerMeterY" : 3937 + } + } +] diff --git a/autotests/read/sct/cmyk.sct.json b/autotests/read/sct/cmyk.sct.json index abf1680..c04b7e3 100644 --- a/autotests/read/sct/cmyk.sct.json +++ b/autotests/read/sct/cmyk.sct.json @@ -1,7 +1,11 @@ [ { "minQtVersion" : "6.8.0", - "fileName" : "cmyk.tif" + "fileName" : "cmyk.tif", + "resolution" : { + "dotsPerMeterX" : 3780, + "dotsPerMeterY" : 3780 + } }, { "maxQtVersion" : "6.7.99", diff --git a/autotests/read/xcf/birthday16.xcf.json b/autotests/read/xcf/birthday16.xcf.json index 6133982..0f6e5b2 100644 --- a/autotests/read/xcf/birthday16.xcf.json +++ b/autotests/read/xcf/birthday16.xcf.json @@ -2,7 +2,11 @@ { "minQtVersion" : "6.7.0", "fileName" : "birthday16.png", - "seeAlso" : "https://bugreports.qt.io/browse/QTBUG-120614" + "seeAlso" : "https://bugreports.qt.io/browse/QTBUG-120614", + "resolution" : { + "dotsPerMeterX" : 4724, + "dotsPerMeterY" : 4724 + } }, { "minQtVersion" : "6.0.0", diff --git a/autotests/read/xcf/birthday32.xcf.json b/autotests/read/xcf/birthday32.xcf.json index a5715e8..8cbe05e 100644 --- a/autotests/read/xcf/birthday32.xcf.json +++ b/autotests/read/xcf/birthday32.xcf.json @@ -2,7 +2,11 @@ { "minQtVersion" : "6.7.0", "fileName" : "birthday32.png", - "seeAlso" : "https://bugreports.qt.io/browse/QTBUG-120614" + "seeAlso" : "https://bugreports.qt.io/browse/QTBUG-120614", + "resolution" : { + "dotsPerMeterX" : 4724, + "dotsPerMeterY" : 4724 + } }, { "minQtVersion" : "6.0.0", diff --git a/autotests/read/xcf/bug_476755_rgb_layers.xcf.json b/autotests/read/xcf/bug_476755_rgb_layers.xcf.json new file mode 100644 index 0000000..eac1dd9 --- /dev/null +++ b/autotests/read/xcf/bug_476755_rgb_layers.xcf.json @@ -0,0 +1,15 @@ +[ + { + "fileName" : "bug_476755_rgb_layers.png", + "metadata" : [ + { + "key" : "Comment" , + "value" : "Created with GIMP" + } + ], + "resolution" : { + "dotsPerMeterX" : 62992, + "dotsPerMeterY" : 62992 + } + } +]