diff --git a/core/src/main/java/META-INF/MANIFEST.MF b/core/src/main/java/META-INF/MANIFEST.MF index b7033fc0c0..0ffb813c23 100644 --- a/core/src/main/java/META-INF/MANIFEST.MF +++ b/core/src/main/java/META-INF/MANIFEST.MF @@ -368,6 +368,6 @@ Require-Extension: 7E673D15-D87C-41A6-8B5F1956528C605F;name=MySQL;label=MySQL;ve 17AB52DE-B300-A94B-E058BD978511E39E;name=S3;label=S3;version=2.0.1.10-SNAPSHOT, 87FE44E5-179C-43A3-A87B3D38BEF4652E;name=EHCache;label=EHCache;version=2.10.0.36, 66E312DD-D083-27C0-64189D16753FD6F0;name=PDF;label=PDF;version=1.1.0.19, - B737ABC4-D43F-4D91-8E8E973E37C40D1B;name=Image;label=Image;version=2.0.0.25;since=5.3.0.35-ALPHA, + B737ABC4-D43F-4D91-8E8E973E37C40D1B;name=Image;label=Image;version=2.0.0.26-SNAPSHOT;since=5.3.0.35-ALPHA, 37C61C0A-5D7E-4256-8572639BE0CF5838;name=Esapi;label=ESAPI;version=2.2.4.13;since=5.3.0.37-ALPHA, 8D7FB0DF-08BB-1589-FE3975678F07DB17;name=Compress;label=Compress;version=1.0.0.15-SNAPSHOT;since=5.3.2.31-SNAPSHOT diff --git a/loader/build.xml b/loader/build.xml index 6544ec24ef..d62b88d598 100644 --- a/loader/build.xml +++ b/loader/build.xml @@ -2,7 +2,7 @@ - + diff --git a/loader/pom.xml b/loader/pom.xml index 3dab0a42c6..ce3450b2b7 100644 --- a/loader/pom.xml +++ b/loader/pom.xml @@ -3,7 +3,7 @@ org.lucee lucee - 6.0.0.551-SNAPSHOT + 6.0.0.552-SNAPSHOT jar Lucee Loader Build diff --git a/test/functions/ImageGetEXIFMetadata.cfc b/test/functions/ImageGetEXIFMetadata.cfc index 44a8a52bd0..fc7388fc42 100644 --- a/test/functions/ImageGetEXIFMetadata.cfc +++ b/test/functions/ImageGetEXIFMetadata.cfc @@ -4,16 +4,23 @@ component extends="org.lucee.cfml.test.LuceeTestCase" { describe("Testcase for imageGetEXIFMetadata()", function() { it( title="checking imageGetEXIFMetadata()", body=function( currentSpec ) { var img = imageRead(GetDirectoryFromPath(GetCurrentTemplatePath())&"images/BigBen.jpg"); - expect(imageGetEXIFMetadata(img)).toBeStruct(); - expect(imageGetEXIFMetadata(img).ColorSpace).toBe("1"); - expect(imageGetEXIFMetadata(img).ExifOffset).toBe("204"); - expect(imageGetEXIFMetadata(img)).toHaveKey("colormodel"); - expect(imageGetEXIFMetadata(img)).toHaveKey("metadata"); - expect(imageGetEXIFMetadata(img)).toHaveKey("exif"); - expect(imageGetEXIFMetadata(img).metadata.Compression.CompressionTypeName).toBe("JPEG"); - expect(imageGetEXIFMetadata(img).compression).toBe("6"); - expect(imageGetEXIFMetadata(img).exif.ColorSpace).toBe("1"); - expect(imageGetEXIFMetadata(img).exif.ExifOffset).toBe("204"); + var meta=imageGetEXIFMetadata(img); + expect(meta).toBeStruct(); + expect(imeta.ColorSpace).toBe("1"); + expect(meta.ExifOffset).toBe("204"); + expect(meta).toHaveKey("colormodel"); + expect(meta).toHaveKey("metadata"); + expect(meta).toHaveKey("exif"); + expect(meta.metadata.Compression.CompressionTypeName).toBe("JPEG"); + expect(meta.compression).toBe("6"); + expect(meta.exif.ColorSpace).toBe("1"); + expect(meta.exif.ExifOffset).toBe("204"); + expect(meta["Subject Location"]).toBe("1631 1223 1795 1077"); + + + + + }); }); }