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

Side by Side Diff: tests/KtxTest.cpp

Issue 1373683003: change pixel-serializer to support reencoding existing data Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: I hate this warning Created 5 years, 2 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 | « tests/ImageTest.cpp ('k') | tools/sk_tool_utils.h » ('j') | 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 2014 Google Inc. 2 * Copyright 2014 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 "Resources.h" 8 #include "Resources.h"
9 #include "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkData.h" 10 #include "SkData.h"
11 #include "SkImage.h"
11 #include "SkImageGenerator.h" 12 #include "SkImageGenerator.h"
12 #include "SkForceLinking.h" 13 #include "SkForceLinking.h"
13 #include "SkImageDecoder.h" 14 #include "SkImageDecoder.h"
14 #include "SkOSFile.h" 15 #include "SkOSFile.h"
15 #include "SkRandom.h" 16 #include "SkRandom.h"
16 #include "SkStream.h" 17 #include "SkStream.h"
17 #include "Test.h" 18 #include "Test.h"
18 19
19 __SK_FORCE_IMAGE_DECODER_LINKING; 20 __SK_FORCE_IMAGE_DECODER_LINKING;
20 21
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 SkString pkmFilename = GetResourcePath("mandrill_128.pkm"); 143 SkString pkmFilename = GetResourcePath("mandrill_128.pkm");
143 144
144 // Load PKM file into a bitmap 145 // Load PKM file into a bitmap
145 SkBitmap etcBitmap; 146 SkBitmap etcBitmap;
146 SkAutoTUnref<SkData> fileData(SkData::NewFromFileName(pkmFilename.c_str())); 147 SkAutoTUnref<SkData> fileData(SkData::NewFromFileName(pkmFilename.c_str()));
147 if (nullptr == fileData) { 148 if (nullptr == fileData) {
148 SkDebugf("KtxReexportPKM: can't load test file %s\n", pkmFilename.c_str( )); 149 SkDebugf("KtxReexportPKM: can't load test file %s\n", pkmFilename.c_str( ));
149 return; 150 return;
150 } 151 }
151 152
152 bool installDiscardablePixelRefSuccess = 153 SkAutoTUnref<SkImage> image(SkImage::NewFromEncoded(fileData));
153 SkDEPRECATED_InstallDiscardablePixelRef(fileData, &etcBitmap); 154 REPORTER_ASSERT(reporter, image.get());
154 REPORTER_ASSERT(reporter, installDiscardablePixelRefSuccess);
155 155
156 // Write the bitmap out to a KTX file. 156 SkAutoDataUnref newKtxData(image->encode(SkImageEncoder::kKTX_Type, 0));
157 SkData *ktxDataPtr = SkImageEncoder::EncodeData(etcBitmap, SkImageEncoder::k KTX_Type, 0); 157 REPORTER_ASSERT(reporter, newKtxData.get());
158 SkAutoDataUnref newKtxData(ktxDataPtr);
159 REPORTER_ASSERT(reporter, ktxDataPtr);
160 158
161 // See is this data is identical to data in existing ktx file. 159 // See is this data is identical to data in existing ktx file.
162 SkString ktxFilename = GetResourcePath("mandrill_128.ktx"); 160 SkString ktxFilename = GetResourcePath("mandrill_128.ktx");
163 SkAutoDataUnref oldKtxData(SkData::NewFromFileName(ktxFilename.c_str())); 161 SkAutoDataUnref oldKtxData(SkData::NewFromFileName(ktxFilename.c_str()));
164 REPORTER_ASSERT(reporter, oldKtxData->equals(newKtxData)); 162 REPORTER_ASSERT(reporter, oldKtxData->equals(newKtxData));
165 } 163 }
OLDNEW
« no previous file with comments | « tests/ImageTest.cpp ('k') | tools/sk_tool_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698