apple_png 0.1.3 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ee347d852329d08bb54a22f38a656b74f8abffac
+  data.tar.gz: 2a70ad73f16d77366845d179df821116cac8f3ed
+SHA512:
+  metadata.gz: eaff6ca90ba20fb20dc3d779fa3f0d941c933f7f774cbd36e2a18c6b4c682b18e470825e31b532fa8e2dde89ba4758227ea8e60213097f840261ef927a9f2053
+  data.tar.gz: e42c0562ef5a25d983c07cd12dc7876e7e5c4440ec514f6cfc93cb605cc9f7cc1be1c0a616a76c70f89aaa4643590a132a72955b2fbef740e4adbc1d1e3b83be

data/ext/apple_png/apple_png.c

@@ -14,6 +14,24 @@
 #define APPLE_PNG_ZLIB_VERSION_ERROR Z_VERSION_ERROR
 #define APPLE_PNG_NO_MEM_ERROR Z_MEM_ERROR
 
+#define N_VALID_CHUNK_NAMES 14
+static const char *VALID_CHUNK_NAMES[] = {
+    "IHDR",
+    "PLTE",
+    "IDAT",
+    "IEND",
+    "cHRM",
+    "gAMA",
+    "sBIT",
+    "bKGD",
+    "hIST",
+    "tRNS",
+    "pHYs",
+    "tIME",
+    "tEXt",
+    "zTXt"
+};
+
 /* calculate how many scanlines an adam7 interlaced png will result in */
 static uint32_t interlaced_count_scanlines(uint32_t width, uint32_t height) {
     uint32_t pass[7];
@@ -238,7 +256,18 @@ static int readPngChunks(VALUE self, const char *oldPNG, size_t oldPngLength, dy
         const char *chunkCRC_raw = &oldPNG[cursor + 8 + chunkLength];
         cursor += chunkLength + 12;
 
-        if (strncmp(chunkType, "IHDR", 4) == 0) {
+        int isValidChunkName = 0;
+        for (unsigned int i = 0; i < N_VALID_CHUNK_NAMES; i++) {
+            if (strncmp(chunkType, VALID_CHUNK_NAMES[i], 4) == 0) {
+                isValidChunkName = 1;
+                break;
+            }
+        }
+
+        if (!isValidChunkName) {
+            /* filter out Apple-specific chunks such as CgBI and iDOT */
+            continue;
+        } else if (strncmp(chunkType, "IHDR", 4) == 0) {
             /* extract dimensions from header */
             width = PNG_BYTES2UINT(&chunkData[0]);
             height = PNG_BYTES2UINT(&chunkData[4]);
@@ -249,9 +278,6 @@ static int readPngChunks(VALUE self, const char *oldPNG, size_t oldPngLength, dy
             /* collect pixel data to process it once an IEND chunk appears */
             dyn_arr_append(applePngCompressedPixelData, chunkData, chunkLength);
             continue;
-        } else if (strncmp(chunkType, "CgBI", 4) == 0) {
-            /* don't write CgBI chunks to the output png  */
-            continue;
         } else if (strncmp(chunkType, "IEND", 4) == 0) {
             /* all png data has been procssed, now flip the color bytes */
             unsigned char *decompressedPixelData, *standardPngCompressedPixelData;

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apple_png
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Marvin Killing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies: []
 description: Converts the Apple PNG format used in iOS packages to standard PNG
 email: marvinkilling@gmail.com
@@ -18,33 +17,32 @@ extensions:
 - ext/apple_png/extconf.rb
 extra_rdoc_files: []
 files:
-- lib/apple_png.rb
 - ext/apple_png/apple_png.c
 - ext/apple_png/dyn_arr.h
 - ext/apple_png/extconf.rb
+- lib/apple_png.rb
 homepage: http://rubygems.org/gems/apple_png
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Converts the Apple PNG format to standard PNG
 test_files: []
 has_rdoc: