cffbcc3b96
This is a major change resulting from a minor tweak. In the old code, the intersection point of two curves was shared between them, but the intersection points and end points of sorted edges was computed directly from the intersection T value. In this CL, both intersection points and sorted points are the same, and intermediate control points are computed to preserve their slope. The sort itself has been completely rewritten to be more robust and remove 'magic' checks, conditions that empirically worked but couldn't be rationalized. This CL was triggered by errors generated computing the clips of SKP files. At this point, all 73M standard tests work and at least the first troublesome SKPs work. Review URL: https://codereview.chromium.org/15338003 git-svn-id: http://skia.googlecode.com/svn/trunk@9432 2bbb7eff-a529-9590-31e7-b0007b416f81
67 lines
2.0 KiB
C++
67 lines
2.0 KiB
C++
#include "SkBitmap.h"
|
|
#include "SkDevice.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkImageDecoder.h"
|
|
#include "SkImageEncoder.h"
|
|
#include "SkStream.h"
|
|
#include "SkOSFile.h"
|
|
#include "SkPicture.h"
|
|
#include "SkString.h"
|
|
#include "Test.h"
|
|
|
|
static void make_filepath(SkString* path, const char* dir, const SkString& name) {
|
|
size_t len = strlen(dir);
|
|
path->set(dir);
|
|
if (len > 0 && dir[len - 1] != '/') {
|
|
path->append("\\");
|
|
}
|
|
path->append(name);
|
|
}
|
|
|
|
static void PathOpsSkpClipTest(skiatest::Reporter* reporter) {
|
|
const char pictDir[] = "D:\\skp";
|
|
const char outSkpClipDir[] = "D:\\skpClip";
|
|
const char outOldClipDir[] = "D:\\oldClip";
|
|
SkOSFile::Iter iter(pictDir, "skp");
|
|
SkString filename;
|
|
while (iter.next(&filename)) {
|
|
#if 01
|
|
if (strcmp(filename.c_str(), "desk_15min-lt.skp")) {
|
|
continue;
|
|
}
|
|
#endif
|
|
SkString path;
|
|
make_filepath(&path, pictDir, filename);
|
|
SkFILEStream stream(path.c_str());
|
|
if (!stream.isValid()) {
|
|
continue;
|
|
}
|
|
bool success;
|
|
SkPicture* pic = SkNEW_ARGS(SkPicture, (&stream, &success, &SkImageDecoder::DecodeMemory));
|
|
if (!success) {
|
|
continue;
|
|
}
|
|
int width = pic->width();
|
|
int height = pic->height();
|
|
SkBitmap bitmap;
|
|
bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
|
|
bitmap.allocPixels();
|
|
SkCanvas canvas(bitmap);
|
|
filename.remove(filename.size() - 3, 3);
|
|
filename.append("png");
|
|
for (int i = 0; i < 2; ++i) {
|
|
bool useOp = i ? true : false;
|
|
canvas.setAllowSimplifyClip(useOp);
|
|
pic->draw(&canvas);
|
|
SkString outFile;
|
|
make_filepath(&outFile, useOp ? outSkpClipDir : outOldClipDir, filename);
|
|
SkImageEncoder::EncodeFile(outFile.c_str(), bitmap, SkImageEncoder::kPNG_Type, 100);
|
|
}
|
|
SkDELETE(pic);
|
|
reporter->bumpTestCount();
|
|
}
|
|
}
|
|
|
|
#include "TestClassDef.h"
|
|
DEFINE_TESTCLASS_SHORT(PathOpsSkpClipTest)
|