Revert of https://codereview.chromium.org/108343006/
Reason for revert: broke some builds
R=rmistry@google.com, mtklein@google.com
TBR=mtklein@google.com, rmistry@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:1943
Author: epoger@google.com
Review URL: https://codereview.chromium.org/102243012
git-svn-id: http://skia.googlecode.com/svn/trunk@12865 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index ce24d9d..f748157 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -13,18 +13,17 @@
'target_name': 'tools',
'type': 'none',
'dependencies': [
- 'bbh_shootout',
'bench_pictures',
'filter',
- 'lua_app',
'lua_pictures',
+ 'bbh_shootout',
+ 'lua_app',
'pinspect',
'render_pdfs',
'render_pictures',
'skdiff',
- 'skhello',
'skpdiff',
- 'skpmaker',
+ 'skhello',
'skimage',
'test_image_decoder',
],
@@ -111,20 +110,6 @@
],
},
{
- 'target_name': 'skpmaker',
- 'type': 'executable',
- 'sources': [
- '../tools/skpmaker.cpp',
- ],
- 'include_dirs': [
- '../src/core',
- ],
- 'dependencies': [
- 'flags.gyp:flags',
- 'skia_lib.gyp:skia_lib',
- ],
- },
- {
'target_name': 'skimagediff',
'type': 'executable',
'sources': [
diff --git a/tools/skpmaker.cpp b/tools/skpmaker.cpp
deleted file mode 100644
index 1388977..0000000
--- a/tools/skpmaker.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Simple tool to generate SKP files for testing.
- */
-
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkCommandLineFlags.h"
-#include "SkPaint.h"
-#include "SkPicture.h"
-#include "SkScalar.h"
-#include "SkStream.h"
-
-// Flags used by this file, alphabetically:
-DEFINE_int32(blue, 128, "Value of blue color channel in image, 0-255.");
-DEFINE_int32(green, 128, "Value of green color channel in image, 0-255.");
-DEFINE_int32(height, 200, "Height of canvas to create.");
-DEFINE_int32(red, 128, "Value of red color channel in image, 0-255.");
-DEFINE_int32(width, 300, "Width of canvas to create.");
-DEFINE_string(writePath, "", "Filepath to write the SKP into.");
-
-static void skpmaker(SkScalar width, SkScalar height, SkColor color,
- const char *writePath) {
- SkPicture pict;
- SkCanvas* canvas = pict.beginRecording(width, height);
- SkPaint paint;
- paint.setStyle(SkPaint::kFill_Style);
- paint.setColor(color);
- canvas->drawRectCoords(0, 0, width, height, paint);
- pict.endRecording();
- SkFILEWStream stream(writePath);
- pict.serialize(&stream);
-}
-
-int tool_main(int argc, char** argv);
-int tool_main(int argc, char** argv) {
- SkCommandLineFlags::SetUsage("Creates a simple .skp file for testing.");
- SkCommandLineFlags::Parse(argc, argv);
-
- // Validate flags.
- if ((FLAGS_blue < 0) || (FLAGS_blue > 255)) {
- SkDebugf("--blue must be within range [0,255]\n");
- exit(-1);
- }
- if ((FLAGS_green < 0) || (FLAGS_green > 255)) {
- SkDebugf("--green must be within range [0,255]\n");
- exit(-1);
- }
- if (FLAGS_height <= 0) {
- SkDebugf("--height must be >0\n");
- exit(-1);
- }
- if ((FLAGS_red < 0) || (FLAGS_red > 255)) {
- SkDebugf("--red must be within range [0,255]\n");
- exit(-1);
- }
- if (FLAGS_width <= 0) {
- SkDebugf("--width must be >0\n");
- exit(-1);
- }
- if (FLAGS_writePath.isEmpty()) {
- SkDebugf("--writePath must be nonempty\n");
- exit(-1);
- }
-
- SkColor color = SkColorSetRGB(FLAGS_red, FLAGS_green, FLAGS_blue);
- skpmaker(SkIntToScalar(FLAGS_width), SkIntToScalar(FLAGS_height), color, FLAGS_writePath[0]);
- return 0;
-}
-
-#if !defined SK_BUILD_FOR_IOS
-int main(int argc, char * const argv[]) {
- return tool_main(argc, (char**) argv);
-}
-#endif