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

Side by Side Diff: webkit/port/platform/image-decoders/gif/GIFImageReader.h

Issue 14113: Remove few more errors in mac scons build. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 12 years 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 | Annotate | Revision Log
OLDNEW
1 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ 1 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
2 /* ***** BEGIN LICENSE BLOCK ***** 2 /* ***** BEGIN LICENSE BLOCK *****
3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
4 * 4 *
5 * The contents of this file are subject to the Mozilla Public License Version 5 * The contents of this file are subject to the Mozilla Public License Version
6 * 1.1 (the "License"); you may not use this file except in compliance with 6 * 1.1 (the "License"); you may not use this file except in compliance with
7 * the License. You may obtain a copy of the License at 7 * the License. You may obtain a copy of the License at
8 * http://www.mozilla.org/MPL/ 8 * http://www.mozilla.org/MPL/
9 * 9 *
10 * Software distributed under the License is distributed on an "AS IS" basis, 10 * Software distributed under the License is distributed on an "AS IS" basis,
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 unsigned bytes_to_consume; /* Number of bytes to accumulate */ 158 unsigned bytes_to_consume; /* Number of bytes to accumulate */
159 unsigned bytes_in_hold; /* bytes accumulated so far*/ 159 unsigned bytes_in_hold; /* bytes accumulated so far*/
160 unsigned char hold[MAX_HOLD_SIZE]; /* Accumulation buffer */ 160 unsigned char hold[MAX_HOLD_SIZE]; /* Accumulation buffer */
161 unsigned char* global_colormap; /* (3* MAX_COLORS in size) Default colorm ap if local not supplied, 3 bytes for each color */ 161 unsigned char* global_colormap; /* (3* MAX_COLORS in size) Default colorm ap if local not supplied, 3 bytes for each color */
162 162
163 /* Global (multi-image) state */ 163 /* Global (multi-image) state */
164 int screen_bgcolor; /* Logical screen background color */ 164 int screen_bgcolor; /* Logical screen background color */
165 int version; /* Either 89 for GIF89 or 87 for GIF87 */ 165 int version; /* Either 89 for GIF89 or 87 for GIF87 */
166 unsigned screen_width; /* Logical screen width & height */ 166 unsigned screen_width; /* Logical screen width & height */
167 unsigned screen_height; 167 unsigned screen_height;
168 int global_colormap_size; /* Size of global colormap array. */ 168 int global_colormap_size; /* Size of global colormap array. */
169 int images_decoded; /* Counts completed frames for animated GIFs */ 169 unsigned int images_decoded; /* Counts completed frames for animated GIFs */
170 int images_count; /* Counted all frames seen so far (including inc omplete frames) */ 170 int images_count; /* Counted all frames seen so far (including in complete frames) */
171 int loop_count; /* Netscape specific extension block to control 171 int loop_count; /* Netscape specific extension block to control
172 the number of animation loops a GIF renders. */ 172 the number of animation loops a GIF renders. */
173 173
174 // Not really global, but convenient to locate here. 174 // Not really global, but convenient to locate here.
175 int count; /* Remaining # bytes in sub-block */ 175 int count; /* Remaining # bytes in sub-block */
176 176
177 GIFFrameReader* frame_reader; 177 GIFFrameReader* frame_reader;
178 178
179 GIFImageReader(WebCore::GIFImageDecoder* client = 0) { 179 GIFImageReader(WebCore::GIFImageDecoder* client = 0) {
180 clientptr = client; 180 clientptr = client;
181 state = gif_type; 181 state = gif_type;
182 bytes_to_consume = 6; 182 bytes_to_consume = 6;
(...skipping 22 matching lines...) Expand all
205 bool read(const unsigned char * buf, unsigned int numbytes, 205 bool read(const unsigned char * buf, unsigned int numbytes,
206 WebCore::GIFImageDecoder::GIFQuery query = WebCore::GIFImageDecode r::GIFFullQuery, unsigned haltAtFrame = -1); 206 WebCore::GIFImageDecoder::GIFQuery query = WebCore::GIFImageDecode r::GIFFullQuery, unsigned haltAtFrame = -1);
207 207
208 private: 208 private:
209 void output_row(); 209 void output_row();
210 int do_lzw(const unsigned char *q); 210 int do_lzw(const unsigned char *q);
211 }; 211 };
212 212
213 #endif 213 #endif
214 214
OLDNEW
« no previous file with comments | « webkit/glue/plugins/plugin_instance.cc ('k') | webkit/port/platform/image-decoders/png/PNGImageDecoder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698