mirror
/
msdfgen
mirror of https://github.com/Chlumsky/msdfgen.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compiler warning fixes

This commit is contained in:
Chlumsky 2020-10-08 10:30:28 +02:00
parent 010f3c92f1
commit 82364f92ec
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/msdf-edge-artifact-patcher.cpp
View File

@ -1,6 +1,7 @@
#include "msdf-edge-artifact-patcher.h"
#include <cstring>
#include <vector>
#include <utility>
#include "arithmetics.hpp"

1
core/shape-description.cpp
View File

@ -75,7 +75,6 @@ static bool readContour(T *input, Contour &output, const Point2 *first, int term
while ((c = readChar(input)) != terminator) {
if (c != ';')
return false;
bool parenthesis = false;
EdgeColor color = WHITE;
int result = readCoord(input, p[1]);
if (result == 2) {

3
main.cpp
View File

@ -389,7 +389,6 @@ int main(int argc, const char * const *argv) {
bool scaleSpecified = false;
double angleThreshold = DEFAULT_ANGLE_THRESHOLD;
double errorCorrectionThreshold = MSDFGEN_DEFAULT_ERROR_CORRECTION_THRESHOLD;
bool defEdgeAssignment = true;
const char *edgeAssignment = NULL;
bool yFlip = false;
bool printMetrics = false;
@ -673,7 +672,7 @@ int main(int argc, const char * const *argv) {
double glyphAdvance = 0;
if (!inputType || !input)
ABORT("No input specified! Use either -svg <file.svg> or -font <file.ttf/otf> <character code>, or see -help.");
if (mode == MULTI_AND_TRUE && (format == BMP || format == AUTO && output && cmpExtension(output, ".bmp")))
if (mode == MULTI_AND_TRUE && (format == BMP || (format == AUTO && output && cmpExtension(output, ".bmp"))))
ABORT("Incompatible image format. A BMP file cannot contain alpha channel, which is required in mtsdf mode.");
Shape shape;
switch (inputType) {