Fix compile warning on mac that breaks a bot, and remove jpeg creation bitmap since we mock the compression.
git-svn-id: http://skia.googlecode.com/svn/trunk@8836 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp
index cf929b4..d8e8b8b 100644
--- a/tests/PDFPrimitivesTest.cpp
+++ b/tests/PDFPrimitivesTest.cpp
@@ -240,22 +240,8 @@
buffer.getOffset()));
}
-// Create a bitmap that would be easier to be compressed in a JPEG than ZIP.
-static void setup_jpegBitmap(SkBitmap* bitmap, int width, int height) {
- bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height);
- bitmap->allocPixels();
- for (int y = 0; y < bitmap->height(); y++) {
- for (int x = 0; x < bitmap->width(); x++) {
- *bitmap->getAddr32(x, y) =
- SkColorSetRGB(0 + y % 20 + 128 + 100 * cos(x * 0.01F),
- 1 + y % 20 + 128 + 100 * cos(x * 0.1F),
- 2 + y % 20 + 128 + 100 * cos(x * 1.0F));
- }
- }
-}
-
// Create a bitmap that would be very eficiently compressed in a ZIP.
-static void setup_solidBitmap(SkBitmap* bitmap, int width, int height) {
+static void setup_bitmap(SkBitmap* bitmap, int width, int height) {
bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height);
bitmap->allocPixels();
bitmap->eraseColor(SK_ColorWHITE);
@@ -284,7 +270,7 @@
static void TestUncompressed(skiatest::Reporter* reporter) {
SkBitmap bitmap;
- setup_solidBitmap(&bitmap, 1, 1);
+ setup_bitmap(&bitmap, 1, 1);
TestImage(reporter, bitmap,
"/Subtype /Image\n"
"/Width 1\n"
@@ -301,7 +287,7 @@
return;
}
SkBitmap bitmap;
- setup_solidBitmap(&bitmap, 10, 10);
+ setup_bitmap(&bitmap, 10, 10);
TestImage(reporter, bitmap,
"/Subtype /Image\n"
"/Width 10\n"
@@ -316,7 +302,7 @@
static void TestDCTDecode(skiatest::Reporter* reporter) {
SkBitmap bitmap;
- setup_jpegBitmap(&bitmap, 32, 32);
+ setup_bitmap(&bitmap, 32, 32);
TestImage(reporter, bitmap,
"/Subtype /Image\n"
"/Width 32\n"