aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/PictureBenchmark.cpp4
-rw-r--r--tools/PictureRenderer.cpp16
-rw-r--r--tools/PictureRenderingFlags.cpp16
-rw-r--r--tools/VisualBench/VisualBench.cpp6
-rw-r--r--tools/VisualBench/VisualBenchmarkStream.cpp4
-rw-r--r--tools/bench_pictures_main.cpp10
-rw-r--r--tools/flags/SkCommandLineFlags.cpp4
-rw-r--r--tools/flags/SkCommandLineFlags.h6
-rw-r--r--tools/render_pdfs_main.cpp5
-rw-r--r--tools/render_pictures_main.cpp27
-rw-r--r--tools/sk_tool_utils_font.cpp4
-rw-r--r--tools/skpdiff/SkDiffContext.cpp6
-rw-r--r--tools/skpdiff/SkPMetric.cpp36
13 files changed, 71 insertions, 73 deletions
diff --git a/tools/PictureBenchmark.cpp b/tools/PictureBenchmark.cpp
index f708f53613..9a86d85f9b 100644
--- a/tools/PictureBenchmark.cpp
+++ b/tools/PictureBenchmark.cpp
@@ -44,10 +44,10 @@ void PictureBenchmark::setTimersToShow(bool wall,
Timer* PictureBenchmark::setupTimer(bool useGLTimer) {
#if SK_SUPPORT_GPU
if (useGLTimer && fRenderer != NULL && fRenderer->isUsingGpuDevice()) {
- return SkNEW_ARGS(Timer, (fRenderer->getGLContext()));
+ return new Timer(fRenderer->getGLContext());
}
#endif
- return SkNEW_ARGS(Timer, (NULL));
+ return new Timer(NULL);
}
PictureRenderer* PictureBenchmark::setRenderer(sk_tools::PictureRenderer* renderer) {
diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp
index 34b08f567c..ee8e981a39 100644
--- a/tools/PictureRenderer.cpp
+++ b/tools/PictureRenderer.cpp
@@ -131,7 +131,7 @@ SkCanvas* PictureRenderer::setupCanvas(int width, int height) {
case kBitmap_DeviceType: {
SkBitmap bitmap;
sk_tools::setup_bitmap(&bitmap, width, height);
- canvas.reset(SkNEW_ARGS(SkCanvas, (bitmap)));
+ canvas.reset(new SkCanvas(bitmap));
}
break;
#if SK_SUPPORT_GPU
@@ -165,7 +165,7 @@ SkCanvas* PictureRenderer::setupCanvas(int width, int height) {
if (!device) {
return NULL;
}
- canvas.reset(SkNEW_ARGS(SkCanvas, (device)));
+ canvas.reset(new SkCanvas(device));
break;
}
#endif
@@ -179,7 +179,7 @@ SkCanvas* PictureRenderer::setupCanvas(int width, int height) {
canvas->setAllowSoftClip(false);
}
- canvas.reset(SkNEW_ARGS(FlagsFilterCanvas, (canvas.get(), fDrawFilters)));
+ canvas.reset(new FlagsFilterCanvas(canvas.get(), fDrawFilters));
}
this->scaleToScaleFactor(canvas);
@@ -408,7 +408,7 @@ bool PipePictureRenderer::render(SkBitmap** out) {
writer.endRecording();
fCanvas->flush();
if (out) {
- *out = SkNEW(SkBitmap);
+ *out = new SkBitmap;
setup_bitmap(*out, SkScalarCeilToInt(fPicture->cullRect().width()),
SkScalarCeilToInt(fPicture->cullRect().height()));
fCanvas->readPixels(*out, 0, 0);
@@ -453,7 +453,7 @@ bool SimplePictureRenderer::render(SkBitmap** out) {
}
fCanvas->flush();
if (out) {
- *out = SkNEW(SkBitmap);
+ *out = new SkBitmap;
setup_bitmap(*out, SkScalarCeilToInt(fPicture->cullRect().width()),
SkScalarCeilToInt(fPicture->cullRect().height()));
fCanvas->readPixels(*out, 0, 0);
@@ -694,7 +694,7 @@ bool TiledPictureRenderer::render(SkBitmap** out) {
SkBitmap bitmap;
if (out) {
- *out = SkNEW(SkBitmap);
+ *out = new SkBitmap;
setup_bitmap(*out, SkScalarCeilToInt(fPicture->cullRect().width()),
SkScalarCeilToInt(fPicture->cullRect().height()));
setup_bitmap(&bitmap, fTileWidth, fTileHeight);
@@ -794,7 +794,7 @@ SkString TiledPictureRenderer::getConfigNameInternal() {
void PlaybackCreationRenderer::setup() {
SkAutoTDelete<SkBBHFactory> factory(this->getFactory());
- fRecorder.reset(SkNEW(SkPictureRecorder));
+ fRecorder.reset(new SkPictureRecorder);
SkCanvas* canvas = fRecorder->beginRecording(SkIntToScalar(this->getViewWidth()),
SkIntToScalar(this->getViewHeight()),
factory.get(),
@@ -821,7 +821,7 @@ SkBBHFactory* PictureRenderer::getFactory() {
case kNone_BBoxHierarchyType:
return NULL;
case kRTree_BBoxHierarchyType:
- return SkNEW(SkRTreeFactory);
+ return new SkRTreeFactory;
}
SkASSERT(0); // invalid bbhType
return NULL;
diff --git a/tools/PictureRenderingFlags.cpp b/tools/PictureRenderingFlags.cpp
index bd718a0ca8..7a2fc259d7 100644
--- a/tools/PictureRenderingFlags.cpp
+++ b/tools/PictureRenderingFlags.cpp
@@ -110,7 +110,7 @@ sk_tools::PictureRenderer* parseRenderer(SkString& error, PictureTool tool) {
if (FLAGS_mode.count() >= 1) {
mode = FLAGS_mode[0];
if (0 == strcmp(mode, "record")) {
- renderer.reset(SkNEW_ARGS(sk_tools::RecordPictureRenderer, RENDERER_ARGS));
+ renderer.reset(new sk_tools::RecordPictureRenderer RENDERER_ARGS);
} else if (0 == strcmp(mode, "tile") || 0 == strcmp(mode, "pow2tile")
|| 0 == strcmp(mode, "copyTile")) {
useTiles = true;
@@ -134,10 +134,10 @@ sk_tools::PictureRenderer* parseRenderer(SkString& error, PictureTool tool) {
heightString = FLAGS_mode[2];
} else if (0 == strcmp(mode, "playbackCreation") && kBench_PictureTool == tool) {
- renderer.reset(SkNEW_ARGS(sk_tools::PlaybackCreationRenderer, RENDERER_ARGS));
+ renderer.reset(new sk_tools::PlaybackCreationRenderer RENDERER_ARGS);
// undocumented
} else if (0 == strcmp(mode, "rerecord") && kRender_PictureTool == tool) {
- renderer.reset(SkNEW_ARGS(sk_tools::RecordPictureRenderer, RENDERER_ARGS));
+ renderer.reset(new sk_tools::RecordPictureRenderer RENDERER_ARGS);
} else if (0 == strcmp(mode, "simple")) {
// Allow 'mode' to be set to 'simple', but do not create a renderer, so we can
// ensure that pipe does not override a mode besides simple. The renderer will
@@ -175,12 +175,12 @@ sk_tools::PictureRenderer* parseRenderer(SkString& error, PictureTool tool) {
x = y = 4;
}
#if SK_SUPPORT_GPU
- tiledRenderer.reset(SkNEW_ARGS(sk_tools::CopyTilesRenderer, (grContextOpts, x, y)));
+ tiledRenderer.reset(new sk_tools::CopyTilesRenderer(grContextOpts, x, y));
#else
- tiledRenderer.reset(SkNEW_ARGS(sk_tools::CopyTilesRenderer, (x, y)));
+ tiledRenderer.reset(new sk_tools::CopyTilesRenderer(x, y));
#endif
} else {
- tiledRenderer.reset(SkNEW_ARGS(sk_tools::TiledPictureRenderer, RENDERER_ARGS));
+ tiledRenderer.reset(new sk_tools::TiledPictureRenderer RENDERER_ARGS);
}
if (isPowerOf2Mode) {
@@ -241,12 +241,12 @@ sk_tools::PictureRenderer* parseRenderer(SkString& error, PictureTool tool) {
error.printf("Pipe is incompatible with other modes.\n");
return NULL;
}
- renderer.reset(SkNEW_ARGS(sk_tools::PipePictureRenderer, RENDERER_ARGS));
+ renderer.reset(new sk_tools::PipePictureRenderer RENDERER_ARGS);
}
}
if (NULL == renderer) {
- renderer.reset(SkNEW_ARGS(sk_tools::SimplePictureRenderer, RENDERER_ARGS));
+ renderer.reset(new sk_tools::SimplePictureRenderer RENDERER_ARGS);
}
if (FLAGS_viewport.count() > 0) {
diff --git a/tools/VisualBench/VisualBench.cpp b/tools/VisualBench/VisualBench.cpp
index b24672af99..0763d5cacc 100644
--- a/tools/VisualBench/VisualBench.cpp
+++ b/tools/VisualBench/VisualBench.cpp
@@ -57,20 +57,20 @@ VisualBench::VisualBench(void* hwnd, int argc, char** argv)
, fLoops(1)
, fState(kPreWarmLoops_State)
, fBenchmark(NULL)
- , fResults(SkNEW(ResultsWriter)) {
+ , fResults(new ResultsWriter) {
SkCommandLineFlags::Parse(argc, argv);
this->setTitle();
this->setupBackend();
- fBenchmarkStream.reset(SkNEW(VisualBenchmarkStream));
+ fBenchmarkStream.reset(new VisualBenchmarkStream);
// Print header
SkDebugf("curr/maxrss\tloops\tflushes\tmin\tmedian\tmean\tmax\tstddev\tbench\n");
// setup json logging if required
if (!FLAGS_outResultsFile.isEmpty()) {
- fResults.reset(SkNEW(NanoJSONResultsWriter(FLAGS_outResultsFile[0])));
+ fResults.reset(new NanoJSONResultsWriter(FLAGS_outResultsFile[0]));
}
if (1 == FLAGS_properties.count() % 2) {
diff --git a/tools/VisualBench/VisualBenchmarkStream.cpp b/tools/VisualBench/VisualBenchmarkStream.cpp
index e3eb44d5b9..f8d01a1d91 100644
--- a/tools/VisualBench/VisualBenchmarkStream.cpp
+++ b/tools/VisualBench/VisualBenchmarkStream.cpp
@@ -93,7 +93,7 @@ Benchmark* VisualBenchmarkStream::innerNext() {
if (gm->runAsBench()) {
fSourceType = "gm";
fBenchType = "micro";
- return SkNEW_ARGS(GMBench, (gm.detach()));
+ return new GMBench(gm.detach());
}
}
@@ -108,7 +108,7 @@ Benchmark* VisualBenchmarkStream::innerNext() {
SkString name = SkOSPath::Basename(path.c_str());
fSourceType = "skp";
fBenchType = "playback";
- return SkNEW_ARGS(VisualSKPBench, (name.c_str(), pic.get()));
+ return new VisualSKPBench(name.c_str(), pic.get());
}
return NULL;
diff --git a/tools/bench_pictures_main.cpp b/tools/bench_pictures_main.cpp
index b29f4d106e..865bb5184f 100644
--- a/tools/bench_pictures_main.cpp
+++ b/tools/bench_pictures_main.cpp
@@ -431,13 +431,9 @@ int tool_main(int argc, char** argv) {
SkAutoTDelete<PictureJSONResultsWriter> jsonWriter;
if (FLAGS_jsonLog.count() == 1) {
SkASSERT(FLAGS_builderName.count() == 1 && FLAGS_gitHash.count() == 1);
- jsonWriter.reset(SkNEW(PictureJSONResultsWriter(
- FLAGS_jsonLog[0],
- FLAGS_builderName[0],
- FLAGS_buildNumber,
- FLAGS_timestamp,
- FLAGS_gitHash[0],
- FLAGS_gitNumber)));
+ jsonWriter.reset(new PictureJSONResultsWriter(FLAGS_jsonLog[0], FLAGS_builderName[0],
+ FLAGS_buildNumber, FLAGS_timestamp,
+ FLAGS_gitHash[0], FLAGS_gitNumber));
gWriter.add(jsonWriter.get());
}
diff --git a/tools/flags/SkCommandLineFlags.cpp b/tools/flags/SkCommandLineFlags.cpp
index ec9949bafc..2ea45c2e71 100644
--- a/tools/flags/SkCommandLineFlags.cpp
+++ b/tools/flags/SkCommandLineFlags.cpp
@@ -18,7 +18,7 @@ template <typename T> static void ignore_result(const T&) {}
bool SkFlagInfo::CreateStringFlag(const char* name, const char* shortName,
SkCommandLineFlags::StringArray* pStrings,
const char* defaultValue, const char* helpString) {
- SkFlagInfo* info = SkNEW_ARGS(SkFlagInfo, (name, shortName, kString_FlagType, helpString));
+ SkFlagInfo* info = new SkFlagInfo(name, shortName, kString_FlagType, helpString);
info->fDefaultString.set(defaultValue);
info->fStrings = pStrings;
@@ -334,7 +334,7 @@ void SkCommandLineFlags::Parse(int argc, char** argv) {
gHead = NULL;
while (flag != NULL) {
SkFlagInfo* next = flag->next();
- SkDELETE(flag);
+ delete flag;
flag = next;
}
if (helpPrinted) {
diff --git a/tools/flags/SkCommandLineFlags.h b/tools/flags/SkCommandLineFlags.h
index 465d4a01f9..ae504cba81 100644
--- a/tools/flags/SkCommandLineFlags.h
+++ b/tools/flags/SkCommandLineFlags.h
@@ -262,7 +262,7 @@ public:
*/
static bool CreateBoolFlag(const char* name, const char* shortName, bool* pBool,
bool defaultValue, const char* helpString) {
- SkFlagInfo* info = SkNEW_ARGS(SkFlagInfo, (name, shortName, kBool_FlagType, helpString));
+ SkFlagInfo* info = new SkFlagInfo(name, shortName, kBool_FlagType, helpString);
info->fBoolValue = pBool;
*info->fBoolValue = info->fDefaultBool = defaultValue;
return true;
@@ -283,7 +283,7 @@ public:
*/
static bool CreateIntFlag(const char* name, int32_t* pInt,
int32_t defaultValue, const char* helpString) {
- SkFlagInfo* info = SkNEW_ARGS(SkFlagInfo, (name, NULL, kInt_FlagType, helpString));
+ SkFlagInfo* info = new SkFlagInfo(name, NULL, kInt_FlagType, helpString);
info->fIntValue = pInt;
*info->fIntValue = info->fDefaultInt = defaultValue;
return true;
@@ -294,7 +294,7 @@ public:
*/
static bool CreateDoubleFlag(const char* name, double* pDouble,
double defaultValue, const char* helpString) {
- SkFlagInfo* info = SkNEW_ARGS(SkFlagInfo, (name, NULL, kDouble_FlagType, helpString));
+ SkFlagInfo* info = new SkFlagInfo(name, NULL, kDouble_FlagType, helpString);
info->fDoubleValue = pDouble;
*info->fDoubleValue = info->fDefaultDouble = defaultValue;
return true;
diff --git a/tools/render_pdfs_main.cpp b/tools/render_pdfs_main.cpp
index 4e13f7ebd0..9b80ef4d50 100644
--- a/tools/render_pdfs_main.cpp
+++ b/tools/render_pdfs_main.cpp
@@ -115,7 +115,7 @@ public:
static SkWStream* open_stream(const SkString& outputDir,
const SkString& inputFilename) {
if (outputDir.isEmpty()) {
- return SkNEW(NullWStream);
+ return new NullWStream;
}
SkString outputPath;
@@ -123,8 +123,7 @@ static SkWStream* open_stream(const SkString& outputDir,
return NULL;
}
- SkAutoTDelete<SkFILEWStream> stream(
- SkNEW_ARGS(SkFILEWStream, (outputPath.c_str())));
+ SkAutoTDelete<SkFILEWStream> stream(new SkFILEWStream(outputPath.c_str()));
if (!stream.get() || !stream->isValid()) {
SkDebugf("Could not write to file %s\n", outputPath.c_str());
return NULL;
diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp
index 392083197e..8cda966664 100644
--- a/tools/render_pictures_main.cpp
+++ b/tools/render_pictures_main.cpp
@@ -273,7 +273,7 @@ static bool render_picture(const SkString& inputPath, const SkString* writePath,
if (!success || ((FLAGS_validate || FLAGS_writeWholeImage) && bitmap == NULL)) {
SkDebugf("Failed to draw the picture.\n");
- SkDELETE(bitmap);
+ delete bitmap;
return false;
}
@@ -290,10 +290,9 @@ static bool render_picture(const SkString& inputPath, const SkString* writePath,
arbbh.set(referenceRenderer, sk_tools::PictureRenderer::kNone_BBoxHierarchyType);
} else {
#if SK_SUPPORT_GPU
- referenceRenderer = SkNEW_ARGS(sk_tools::SimplePictureRenderer,
- (renderer.getGrContextOptions()));
+ referenceRenderer = new sk_tools::SimplePictureRenderer(renderer.getGrContextOptions());
#else
- referenceRenderer = SkNEW(sk_tools::SimplePictureRenderer);
+ referenceRenderer = new sk_tools::SimplePictureRenderer;
#endif
}
SkAutoTUnref<sk_tools::PictureRenderer> aurReferenceRenderer(referenceRenderer);
@@ -303,23 +302,23 @@ static bool render_picture(const SkString& inputPath, const SkString* writePath,
if (!success || NULL == referenceBitmap || NULL == referenceBitmap->getPixels()) {
SkDebugf("Failed to draw the reference picture.\n");
- SkDELETE(bitmap);
- SkDELETE(referenceBitmap);
+ delete bitmap;
+ delete referenceBitmap;
return false;
}
if (success && (bitmap->width() != referenceBitmap->width())) {
SkDebugf("Expected image width: %i, actual image width %i.\n",
referenceBitmap->width(), bitmap->width());
- SkDELETE(bitmap);
- SkDELETE(referenceBitmap);
+ delete bitmap;
+ delete referenceBitmap;
return false;
}
if (success && (bitmap->height() != referenceBitmap->height())) {
SkDebugf("Expected image height: %i, actual image height %i",
referenceBitmap->height(), bitmap->height());
- SkDELETE(bitmap);
- SkDELETE(referenceBitmap);
+ delete bitmap;
+ delete referenceBitmap;
return false;
}
@@ -336,13 +335,13 @@ static bool render_picture(const SkString& inputPath, const SkString* writePath,
x, y, FLAGS_maxComponentDiff,
*referenceBitmap->getAddr32(x, y),
*bitmap->getAddr32(x, y));
- SkDELETE(bitmap);
- SkDELETE(referenceBitmap);
+ delete bitmap;
+ delete referenceBitmap;
return false;
}
}
}
- SkDELETE(referenceBitmap);
+ delete referenceBitmap;
for (int i = 1; i <= 255; ++i) {
if(diffs[i] > 0) {
@@ -373,7 +372,7 @@ static bool render_picture(const SkString& inputPath, const SkString* writePath,
success &= sk_tools::write_bitmap_to_disk(*bitmap, *writePath, NULL, outputFilename);
}
}
- SkDELETE(bitmap);
+ delete bitmap;
return success;
}
diff --git a/tools/sk_tool_utils_font.cpp b/tools/sk_tool_utils_font.cpp
index 06008c6243..6d6fda97c8 100644
--- a/tools/sk_tool_utils_font.cpp
+++ b/tools/sk_tool_utils_font.cpp
@@ -59,13 +59,13 @@ SkTypeface* create_font(const char* name, SkTypeface::Style style) {
if (fontData->fFontCache) {
font = SkSafeRef(fontData->fFontCache);
} else {
- font = SkNEW_ARGS(SkTestFont, (*fontData));
+ font = new SkTestFont(*fontData);
SkDEBUGCODE(font->fDebugName = sub->fName);
SkDEBUGCODE(font->fDebugStyle = sub->fStyle);
fontData->fFontCache = SkSafeRef(font);
}
}
- return SkNEW_ARGS(SkTestTypeface, (font, SkFontStyle(style)));
+ return new SkTestTypeface(font, SkFontStyle(style));
}
}
diff --git a/tools/skpdiff/SkDiffContext.cpp b/tools/skpdiff/SkDiffContext.cpp
index d14546046c..5add0df515 100644
--- a/tools/skpdiff/SkDiffContext.cpp
+++ b/tools/skpdiff/SkDiffContext.cpp
@@ -28,7 +28,7 @@ SkDiffContext::SkDiffContext() {
SkDiffContext::~SkDiffContext() {
if (fDiffers) {
- SkDELETE_ARRAY(fDiffers);
+ delete[] fDiffers;
}
}
@@ -57,14 +57,14 @@ void SkDiffContext::setLongNames(const bool useLongNames) {
void SkDiffContext::setDiffers(const SkTDArray<SkImageDiffer*>& differs) {
// Delete whatever the last array of differs was
if (fDiffers) {
- SkDELETE_ARRAY(fDiffers);
+ delete[] fDiffers;
fDiffers = NULL;
fDifferCount = 0;
}
// Copy over the new differs
fDifferCount = differs.count();
- fDiffers = SkNEW_ARRAY(SkImageDiffer*, fDifferCount);
+ fDiffers = new SkImageDiffer* [fDifferCount];
differs.copy(fDiffers);
}
diff --git a/tools/skpdiff/SkPMetric.cpp b/tools/skpdiff/SkPMetric.cpp
index 392a342215..3563642880 100644
--- a/tools/skpdiff/SkPMetric.cpp
+++ b/tools/skpdiff/SkPMetric.cpp
@@ -1,3 +1,9 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
#include <cmath>
#include <math.h>
@@ -25,12 +31,10 @@ struct Image2D {
height(h) {
SkASSERT(w > 0);
SkASSERT(h > 0);
- image = SkNEW_ARRAY(T, w * h);
+ image = new T[w * h];
}
- ~Image2D() {
- SkDELETE_ARRAY(image);
- }
+ ~Image2D() { delete[] image; }
void readPixel(int x, int y, T* pixel) const {
SkASSERT(x >= 0);
@@ -66,17 +70,17 @@ struct ImageArray
ImageArray(int w, int h, int s)
: slices(s) {
SkASSERT(s > 0);
- image = SkNEW_ARRAY(Image2D<T>*, s);
+ image = new Image2D<T>* [s];
for (int sliceIndex = 0; sliceIndex < slices; sliceIndex++) {
- image[sliceIndex] = SkNEW_ARGS(Image2D<T>, (w, h));
+ image[sliceIndex] = new Image2D<T>(w, h);
}
}
~ImageArray() {
for (int sliceIndex = 0; sliceIndex < slices; sliceIndex++) {
- SkDELETE(image[sliceIndex]);
+ delete image[sliceIndex];
}
- SkDELETE_ARRAY(image);
+ delete[] image;
}
Image2D<T>* getLayer(int z) const {
@@ -296,9 +300,9 @@ static double pmetric(const ImageLAB* baselineLAB, const ImageLAB* testLAB, int*
ImageL3D baselineL(width, height, maxLevels);
ImageL3D testL(width, height, maxLevels);
ImageL scratchImageL(width, height);
- float* cyclesPerDegree = SkNEW_ARRAY(float, maxLevels);
- float* thresholdFactorFrequency = SkNEW_ARRAY(float, maxLevels - 2);
- float* contrast = SkNEW_ARRAY(float, maxLevels - 2);
+ float* cyclesPerDegree = new float[maxLevels];
+ float* thresholdFactorFrequency = new float[maxLevels - 2];
+ float* contrast = new float[maxLevels - 2];
lab_to_l(baselineLAB, baselineL.getLayer(0));
lab_to_l(testLAB, testL.getLayer(0));
@@ -311,7 +315,7 @@ static double pmetric(const ImageLAB* baselineLAB, const ImageLAB* testLAB, int*
// Contrast sensitivity is based on image dimensions. Therefore it cannot be statically
// generated.
- float* contrastSensitivityTable = SkNEW_ARRAY(float, maxLevels * 1000);
+ float* contrastSensitivityTable = new float[maxLevels * 1000];
for (int levelIndex = 0; levelIndex < maxLevels; levelIndex++) {
for (int csLum = 0; csLum < 1000; csLum++) {
contrastSensitivityTable[levelIndex * 1000 + csLum] =
@@ -435,10 +439,10 @@ static double pmetric(const ImageLAB* baselineLAB, const ImageLAB* testLAB, int*
}
}
- SkDELETE_ARRAY(cyclesPerDegree);
- SkDELETE_ARRAY(contrast);
- SkDELETE_ARRAY(thresholdFactorFrequency);
- SkDELETE_ARRAY(contrastSensitivityTable);
+ delete[] cyclesPerDegree;
+ delete[] contrast;
+ delete[] thresholdFactorFrequency;
+ delete[] contrastSensitivityTable;
return 1.0 - (double)(*poiCount) / (width * height);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-08 17:01:38 +0000