walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hide justification behind HB_DIRECTWRITE_EXPERIMENTAL_JUSTIFICATION

This commit is contained in:
Ebrahim Byagowi 2016-04-02 13:47:59 +00:00
parent 63ee9ca5d8
commit 4a10402169
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-directwrite.cc
View File

@ -25,7 +25,7 @@
#define HB_SHAPER directwrite #define HB_SHAPER directwrite
#include "hb-shaper-impl-private.hh" #include "hb-shaper-impl-private.hh"
#ifdef HB_DIRECWRITE_PRE_WINDOWS8_COMPATIBLE #ifndef HB_DIRECTWRITE_EXPERIMENTAL_JUSTIFICATION
#include <DWrite.h> #include <DWrite.h>
#else #else
#include <DWrite_1.h> #include <DWrite_1.h>
@ -602,7 +602,7 @@ _hb_directwrite_shape(hb_shape_plan_t *shape_plan,
hb_directwrite_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font); hb_directwrite_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font);
// factory probably should be cached // factory probably should be cached
#ifdef HB_DIRECWRITE_PRE_WINDOWS8_COMPATIBLE #ifndef HB_DIRECTWRITE_EXPERIMENTAL_JUSTIFICATION
IDWriteFactory* dwriteFactory; IDWriteFactory* dwriteFactory;
#else #else
IDWriteFactory1* dwriteFactory; IDWriteFactory1* dwriteFactory;
@ -618,7 +618,7 @@ _hb_directwrite_shape(hb_shape_plan_t *shape_plan,
IDWriteFontFace* fontFace; IDWriteFontFace* fontFace;
gdiInterop->CreateFontFaceFromHdc (font_data->hdc, &fontFace); gdiInterop->CreateFontFaceFromHdc (font_data->hdc, &fontFace);
#ifdef HB_DIRECWRITE_PRE_WINDOWS8_COMPATIBLE #ifndef HB_DIRECTWRITE_EXPERIMENTAL_JUSTIFICATION
IDWriteTextAnalyzer* analyzer; IDWriteTextAnalyzer* analyzer;
dwriteFactory->CreateTextAnalyzer(&analyzer); dwriteFactory->CreateTextAnalyzer(&analyzer);
#else #else
@ -799,7 +799,7 @@ retry_getglyphs:
return false; return false;
} }
#ifndef HB_DIRECWRITE_PRE_WINDOWS8_COMPATIBLE #ifdef HB_DIRECTWRITE_EXPERIMENTAL_JUSTIFICATION
DWRITE_JUSTIFICATION_OPPORTUNITY* justificationOpportunities = DWRITE_JUSTIFICATION_OPPORTUNITY* justificationOpportunities =
(DWRITE_JUSTIFICATION_OPPORTUNITY*) (DWRITE_JUSTIFICATION_OPPORTUNITY*)