Commits:
11 changed files:
Changes:
graph/grobjs.c
| ... |
... |
@@ -171,11 +171,11 @@ |
|
171
|
171
|
|
|
172
|
172
|
|
|
173
|
173
|
/* check mode */
|
|
174
|
|
- if (check_mode(pixel_mode,num_grays))
|
|
|
174
|
+ if ( check_mode( pixel_mode, num_grays ) )
|
|
175
|
175
|
goto Fail;
|
|
176
|
176
|
|
|
177
|
177
|
/* check dimensions */
|
|
178
|
|
- if (width < 0 || height < 0)
|
|
|
178
|
+ if ( width < 0 || height < 0 )
|
|
179
|
179
|
{
|
|
180
|
180
|
grError = gr_err_bad_argument;
|
|
181
|
181
|
goto Fail;
|
src/ftcommon.c
| ... |
... |
@@ -1855,7 +1855,7 @@ |
|
1855
|
1855
|
|
|
1856
|
1856
|
/* calculate the extent */
|
|
1857
|
1857
|
if ( sc->extent )
|
|
1858
|
|
- for( n = first; n < first + last || pen.x > 0; n++ ) /* chk progress */
|
|
|
1858
|
+ for ( n = first; n < first + last || pen.x > 0; n++ ) /* chk progress */
|
|
1859
|
1859
|
{
|
|
1860
|
1860
|
m = n % handle->string_length; /* recycling */
|
|
1861
|
1861
|
if ( pen.x + handle->string[m].hadvance.x > sc->extent )
|
src/ftdump.c
| ... |
... |
@@ -521,7 +521,7 @@ |
|
521
|
521
|
FT_UInt gid = 0, max_gid = FT_UINT_MAX;
|
|
522
|
522
|
FT_UInt cid = 0, rng_from = 0, rng_to = 0;
|
|
523
|
523
|
char is_first_rng = 1;
|
|
524
|
|
-
|
|
|
524
|
+
|
|
525
|
525
|
|
|
526
|
526
|
if ( face->num_glyphs < 1 )
|
|
527
|
527
|
return;
|
| ... |
... |
@@ -736,7 +736,7 @@ |
|
736
|
736
|
/* CharMaps */
|
|
737
|
737
|
printf( "charmaps (%d)\n", face->num_charmaps );
|
|
738
|
738
|
|
|
739
|
|
- for( i = 0; i < face->num_charmaps; i++ )
|
|
|
739
|
+ for ( i = 0; i < face->num_charmaps; i++ )
|
|
740
|
740
|
{
|
|
741
|
741
|
FT_CharMap cmap = face->charmaps[i];
|
|
742
|
742
|
FT_Long format = FT_Get_CMap_Format( cmap );
|
src/ftgrid.c
| ... |
... |
@@ -1083,7 +1083,7 @@ |
|
1083
|
1083
|
frc = ( frc & 3 ) | 4;
|
|
1084
|
1084
|
|
|
1085
|
1085
|
if ( -8 < exp && exp <= 8 )
|
|
1086
|
|
- status.scale = ldexpf( 0.125f * frc , exp );
|
|
|
1086
|
+ status.scale = ldexpf( 0.125f * frc, exp );
|
|
1087
|
1087
|
}
|
|
1088
|
1088
|
|
|
1089
|
1089
|
|
src/ftinspect/engine/engine.cpp
| ... |
... |
@@ -292,8 +292,8 @@ Engine::currentFontTricky() |
|
292
|
292
|
|
|
293
|
293
|
FTC_FaceID getFTCIdWithHighestBitSet(FTC_FaceID id)
|
|
294
|
294
|
{
|
|
295
|
|
- Q_ASSERT_X(sizeof(FTC_FaceID) >= sizeof(uintptr_t),
|
|
296
|
|
- "getFTCIdWithHighestBitSet",
|
|
|
295
|
+ Q_ASSERT_X(sizeof(FTC_FaceID) >= sizeof(uintptr_t),
|
|
|
296
|
+ "getFTCIdWithHighestBitSet",
|
|
297
|
297
|
"FTC_FaceID must be longer than uintptr_t");
|
|
298
|
298
|
return reinterpret_cast<FTC_FaceID>(
|
|
299
|
299
|
reinterpret_cast<uintptr_t>(id)
|
| ... |
... |
@@ -304,8 +304,8 @@ FTC_FaceID getFTCIdWithHighestBitSet(FTC_FaceID id) |
|
304
|
304
|
|
|
305
|
305
|
FTC_FaceID getFTCIdWithHighestBitClear(FTC_FaceID id)
|
|
306
|
306
|
{
|
|
307
|
|
- Q_ASSERT_X(sizeof(FTC_FaceID) >= sizeof(uintptr_t),
|
|
308
|
|
- "getFTCIdWithHighestBitClear",
|
|
|
307
|
+ Q_ASSERT_X(sizeof(FTC_FaceID) >= sizeof(uintptr_t),
|
|
|
308
|
+ "getFTCIdWithHighestBitClear",
|
|
309
|
309
|
"FTC_FaceID must be longer than uintptr_t");
|
|
310
|
310
|
return reinterpret_cast<FTC_FaceID>(
|
|
311
|
311
|
reinterpret_cast<uintptr_t>(id) & INTPTR_MAX
|
src/ftinspect/engine/mmgx.cpp
| ... |
... |
@@ -10,7 +10,7 @@ |
|
10
|
10
|
|
|
11
|
11
|
|
|
12
|
12
|
MMGXState
|
|
13
|
|
-MMGXAxisInfo::get(Engine* engine,
|
|
|
13
|
+MMGXAxisInfo::get(Engine* engine,
|
|
14
|
14
|
unsigned namedInstanceIndex,
|
|
15
|
15
|
std::vector<MMGXAxisInfo>& infos)
|
|
16
|
16
|
{
|
src/ftinspect/glyphcomponents/glyphcontinuous.cpp
| ... |
... |
@@ -207,7 +207,7 @@ GlyphContinuous::mouseMoveEvent(QMouseEvent* event) |
|
207
|
207
|
positionDelta_ = prevPositionDelta_ + delta;
|
|
208
|
208
|
positionDelta_.setX(0); // Don't move horizontally.
|
|
209
|
209
|
// The string renderer will handle the horizontal delta. See below.
|
|
210
|
|
-
|
|
|
210
|
+
|
|
211
|
211
|
// Note the double use of `scale_`: one for undoing `delta /= scale_`,
|
|
212
|
212
|
// the other one for effectively dividing the width by the scaling
|
|
213
|
213
|
// factor.
|
src/ftinspect/panels/settingpanelmmgx.cpp
| ... |
... |
@@ -192,7 +192,7 @@ SettingPanelMMGX::resetDefaultClicked() |
|
192
|
192
|
{
|
|
193
|
193
|
for (auto w : itemWidgets_)
|
|
194
|
194
|
w->resetDefault();
|
|
195
|
|
-
|
|
|
195
|
+
|
|
196
|
196
|
retrieveValues();
|
|
197
|
197
|
emit mmgxCoordsChanged();
|
|
198
|
198
|
}
|
src/ftmemchk.c
| ... |
... |
@@ -311,7 +311,7 @@ int main( int argc, char** argv ) |
|
311
|
311
|
if (error)
|
|
312
|
312
|
{
|
|
313
|
313
|
if ( Fail < 10 )
|
|
314
|
|
- printf( "glyph %4u: 0x%04x\n" , id, error );
|
|
|
314
|
+ printf( "glyph %4u: 0x%04x\n", id, error );
|
|
315
|
315
|
Fail++;
|
|
316
|
316
|
}
|
|
317
|
317
|
}
|
src/ftstring.c
| ... |
... |
@@ -167,11 +167,11 @@ |
|
167
|
167
|
limit = outline->points + outline->n_points;
|
|
168
|
168
|
|
|
169
|
169
|
if ( reflect & 1 )
|
|
170
|
|
- for( vec = outline->points; vec < limit; vec++ )
|
|
|
170
|
+ for ( vec = outline->points; vec < limit; vec++ )
|
|
171
|
171
|
vec->x = -vec->x;
|
|
172
|
172
|
|
|
173
|
173
|
if ( reflect & 2 )
|
|
174
|
|
- for( vec = outline->points; vec < limit; vec++ )
|
|
|
174
|
+ for ( vec = outline->points; vec < limit; vec++ )
|
|
175
|
175
|
vec->y = -vec->y;
|
|
176
|
176
|
}
|
|
177
|
177
|
|
src/testname.c
| ... |
... |
@@ -24,13 +24,13 @@ |
|
24
|
24
|
exit( 1 );
|
|
25
|
25
|
if ( FT_Init_FreeType( &font_library ) )
|
|
26
|
26
|
exit( 1 );
|
|
27
|
|
- if ( FT_New_Face( font_library, argv[1], 0 , &font_face ) )
|
|
|
27
|
+ if ( FT_New_Face( font_library, argv[1], 0, &font_face ) )
|
|
28
|
28
|
exit( 1 );
|
|
29
|
|
- if ( FT_Set_Char_Size( font_face , 0 , 768 , 300 , 300 ) )
|
|
|
29
|
+ if ( FT_Set_Char_Size( font_face, 0, 768, 300, 300 ) )
|
|
30
|
30
|
exit( 1 );
|
|
31
|
31
|
|
|
32
|
32
|
num_chars = (int)font_face->num_glyphs;
|
|
33
|
|
- FT_Set_Transform( font_face , NULL , NULL );
|
|
|
33
|
+ FT_Set_Transform( font_face, NULL, NULL );
|
|
34
|
34
|
|
|
35
|
35
|
for ( glyph_ind = 0 ; glyph_ind < num_chars; glyph_ind++ )
|
|
36
|
36
|
{
|
| ... |
... |
@@ -52,7 +52,7 @@ |
|
52
|
52
|
glyph_metrics.horiBearingX / 64,
|
|
53
|
53
|
glyph_metrics.horiBearingY / 64,
|
|
54
|
54
|
glyph_metrics.horiAdvance / 64,
|
|
55
|
|
- bitmap.width , bitmap.rows );
|
|
|
55
|
+ bitmap.width, bitmap.rows );
|
|
56
|
56
|
}
|
|
57
|
57
|
|
|
58
|
58
|
return 0;
|
|