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

Side by Side Diff: src/codec/SkCodec.cpp

Issue 1007373003: fix for invalid for loop syntax broke build (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkCodec.h" 8 #include "SkCodec.h"
9 #include "SkData.h" 9 #include "SkData.h"
10 #include "SkCodec_libbmp.h" 10 #include "SkCodec_libbmp.h"
11 #include "SkCodec_libpng.h" 11 #include "SkCodec_libpng.h"
12 #include "SkStream.h" 12 #include "SkStream.h"
13 13
14 struct DecoderProc { 14 struct DecoderProc {
15 bool (*IsFormat)(SkStream*); 15 bool (*IsFormat)(SkStream*);
16 SkCodec* (*NewFromStream)(SkStream*); 16 SkCodec* (*NewFromStream)(SkStream*);
17 }; 17 };
18 18
19 static const DecoderProc gDecoderProcs[] = { 19 static const DecoderProc gDecoderProcs[] = {
20 { SkPngCodec::IsPng, SkPngCodec::NewFromStream }, 20 { SkPngCodec::IsPng, SkPngCodec::NewFromStream },
21 { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream } 21 { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream }
22 }; 22 };
23 23
24 SkCodec* SkCodec::NewFromStream(SkStream* stream) { 24 SkCodec* SkCodec::NewFromStream(SkStream* stream) {
25 if (!stream) { 25 if (!stream) {
26 return NULL; 26 return NULL;
27 } 27 }
28 for (DecoderProc proc : gDecoderProcs) { 28 for (uint32_t i = 0; i < SK_ARRAY_COUNT(gDecoderProcs); i++) {
29 DecoderProc proc = gDecoderProcs[i];
29 const bool correctFormat = proc.IsFormat(stream); 30 const bool correctFormat = proc.IsFormat(stream);
30 if (!stream->rewind()) { 31 if (!stream->rewind()) {
31 return NULL; 32 return NULL;
32 } 33 }
33 if (correctFormat) { 34 if (correctFormat) {
34 return proc.NewFromStream(stream); 35 return proc.NewFromStream(stream);
35 } 36 }
36 } 37 }
37 return NULL; 38 return NULL;
38 } 39 }
(...skipping 11 matching lines...) Expand all
50 , fNeedsRewind(false) 51 , fNeedsRewind(false)
51 {} 52 {}
52 53
53 bool SkCodec::rewindIfNeeded() { 54 bool SkCodec::rewindIfNeeded() {
54 // Store the value of fNeedsRewind so we can update it. Next read will 55 // Store the value of fNeedsRewind so we can update it. Next read will
55 // require a rewind. 56 // require a rewind.
56 const bool neededRewind = fNeedsRewind; 57 const bool neededRewind = fNeedsRewind;
57 fNeedsRewind = true; 58 fNeedsRewind = true;
58 return !neededRewind || fStream->rewind(); 59 return !neededRewind || fStream->rewind();
59 } 60 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698