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

Unified Diff: src/images/SkJpegUtility_images.h

Issue 1187463005: Revert "Remove ambiguity of SkJpegUtility name." (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « src/images/SkJpegUtility.cpp ('k') | src/images/SkJpegUtility_images.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/images/SkJpegUtility_images.h
diff --git a/src/images/SkJpegUtility_images.h b/src/images/SkJpegUtility_images.h
deleted file mode 100644
index 1a763f843c7473cd1f57957854b7584e20b065d5..0000000000000000000000000000000000000000
--- a/src/images/SkJpegUtility_images.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-/*
- * Copyright 2010 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.
- */
-
-
-#ifndef SkJpegUtility_DEFINED
-#define SkJpegUtility_DEFINED
-
-#include "SkImageDecoder.h"
-#include "SkStream.h"
-
-extern "C" {
- #include "jpeglib.h"
- #include "jerror.h"
-}
-
-#include <setjmp.h>
-
-/* Our error-handling struct.
- *
-*/
-struct skjpeg_error_mgr : jpeg_error_mgr {
- jmp_buf fJmpBuf;
-};
-
-
-void skjpeg_error_exit(j_common_ptr cinfo);
-
-///////////////////////////////////////////////////////////////////////////
-/* Our source struct for directing jpeg to our stream object.
-*/
-struct skjpeg_source_mgr : jpeg_source_mgr {
- skjpeg_source_mgr(SkStream* stream, SkImageDecoder* decoder);
-
- // Unowned.
- SkStream* fStream;
- // Unowned pointer to the decoder, used to check if the decoding process
- // has been cancelled.
- SkImageDecoder* fDecoder;
- enum {
- kBufferSize = 1024
- };
- char fBuffer[kBufferSize];
-};
-
-/////////////////////////////////////////////////////////////////////////////
-/* Our destination struct for directing decompressed pixels to our stream
- * object.
- */
-struct skjpeg_destination_mgr : jpeg_destination_mgr {
- skjpeg_destination_mgr(SkWStream* stream);
-
- SkWStream* fStream;
-
- enum {
- kBufferSize = 1024
- };
- uint8_t fBuffer[kBufferSize];
-};
-
-#endif
« no previous file with comments | « src/images/SkJpegUtility.cpp ('k') | src/images/SkJpegUtility_images.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698