Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Unified Diff: src/codec/SkGifInterlaceIter.cpp

Issue 1022673011: Creating a new wrapper for gif decoder (Closed) Base URL: https://skia.googlesource.com/skia.git@ico-real
Patch Set: Adding gif functionality to SkCodec Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« src/codec/SkGifInterlaceIter.h ('K') | « src/codec/SkGifInterlaceIter.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/codec/SkGifInterlaceIter.cpp
diff --git a/src/codec/SkGifInterlaceIter.cpp b/src/codec/SkGifInterlaceIter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..64911d78f5f1882e91b28798a38562617a73e446
--- /dev/null
+++ b/src/codec/SkGifInterlaceIter.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkGifInterlaceIter.h"
+
+static const uint8_t kStartingInterlaceYValue[] = { 0, 4, 2, 1 };
scroggo 2015/03/25 19:44:49 nit: Values, plural.
msarett 2015/03/26 19:15:57 Done.
+static const uint8_t kDeltaInterlaceYValue[] = { 8, 8, 4, 2 };
+
+SkGifInterlaceIter::SkGifInterlaceIter(int height) : fHeight(height) {
+ fStartYPtr = kStartingInterlaceYValue;
+ fDeltaYPtr = kDeltaInterlaceYValue;
+
+ fCurrY = *fStartYPtr++;
+ fDeltaY = *fDeltaYPtr++;
+}
+
+void SkGifInterlaceIter::prepareY() {
+ uint32_t y = fCurrY + fDeltaY;
+
+ // We went from an if statement to a while loop so that we iterate
scroggo 2015/03/25 19:44:49 Are you saying that the old decoder trashed memory
msarett 2015/03/26 19:15:57 This comment is straight from the old decoder. I
+ // through fStartYPtr until a valid row is found. This is so that
+ // images that are smaller than 5x5 will not trash memory.
+ while (y >= fHeight) {
+ if (kStartingInterlaceYValue +
+ SK_ARRAY_COUNT(kStartingInterlaceYValue) == fStartYPtr) {
+ // Now we have iterated over the entire image. Forbid any
+ // subsequent calls to nextY().
+ SkDEBUGCODE(fStartYPtr = NULL;)
+ SkDEBUGCODE(fDeltaYPtr = NULL;)
+ y = 0;
+ } else {
+ y = *fStartYPtr++;
+ fDeltaY = *fDeltaYPtr++;
+ }
+ }
+ fCurrY = y;
+}
+
+uint32_t SkGifInterlaceIter::nextY() {
+ SkASSERT(fStartYPtr);
+ SkASSERT(fDeltaYPtr);
+ uint32_t y = fCurrY;
+ prepareY();
+ return y;
+}
« src/codec/SkGifInterlaceIter.h ('K') | « src/codec/SkGifInterlaceIter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698