Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hi! I cleaned up your code for you! #1

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions FreeType/include/freetype/internal/autohint.h
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ FT_BEGIN_HEADER
reset_face_, get_global_hints_, done_global_hints_, load_glyph_ \
};

#else /* FT_CONFIG_OPTION_PIC */
#else /* FT_CONFIG_OPTION_PIC */

#define FT_DEFINE_AUTOHINTER_SERVICE(class_, reset_face_, get_global_hints_, \
done_global_hints_, load_glyph_) \
Expand All @@ -219,9 +219,9 @@ FT_BEGIN_HEADER
clazz->get_global_hints = get_global_hints_; \
clazz->done_global_hints = done_global_hints_; \
clazz->load_glyph = load_glyph_; \
}
}

#endif /* FT_CONFIG_OPTION_PIC */
#endif /* FT_CONFIG_OPTION_PIC */

FT_END_HEADER

Expand Down
6 changes: 3 additions & 3 deletions FreeType/include/freetype/internal/ftdriver.h
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ FT_BEGIN_HEADER

#define FT_DECLARE_DRIVER(class_) \
FT_CALLBACK_TABLE \
const FT_Driver_ClassRec class_;
const FT_Driver_ClassRec class_;

#define FT_DEFINE_DRIVER(class_, \
flags_, size_, name_, version_, requires_, \
Expand Down Expand Up @@ -327,7 +327,7 @@ FT_BEGIN_HEADER
select_size_ \
};

#else /* FT_CONFIG_OPTION_PIC */
#else /* FT_CONFIG_OPTION_PIC */

#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
#define FT_DEFINE_DRIVERS_OLD_INTERNALS(a_,b_) \
Expand Down Expand Up @@ -409,7 +409,7 @@ FT_BEGIN_HEADER
\
*output_class = (FT_Module_Class*)clazz; \
return FT_Err_Ok; \
}
}


#endif /* FT_CONFIG_OPTION_PIC */
Expand Down
30 changes: 15 additions & 15 deletions FreeType/include/freetype/internal/ftobjs.h
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ FT_BEGIN_HEADER
clazz->variant_list = variant_list_; \
clazz->charvariant_list = charvariant_list_; \
clazz->variantchar_list = variantchar_list_; \
}
}
#endif /* FT_CONFIG_OPTION_PIC */

/* create a new charmap and add it to charmap->face */
Expand Down Expand Up @@ -976,7 +976,7 @@ FT_BEGIN_HEADER
move_to_, line_to_, conic_to_, cubic_to_, shift_, delta_ \
};

#else /* FT_CONFIG_OPTION_PIC */
#else /* FT_CONFIG_OPTION_PIC */

#define FT_DEFINE_OUTLINE_FUNCS(class_, move_to_, line_to_, conic_to_, \
cubic_to_, shift_, delta_) \
Expand All @@ -990,9 +990,9 @@ FT_BEGIN_HEADER
clazz->shift = shift_; \
clazz->delta = delta_; \
return FT_Err_Ok; \
}
}

#endif /* FT_CONFIG_OPTION_PIC */
#endif /* FT_CONFIG_OPTION_PIC */

/*************************************************************************/
/* */
Expand All @@ -1018,7 +1018,7 @@ FT_BEGIN_HEADER
raster_set_mode_, raster_render_, raster_done_ \
};

#else /* FT_CONFIG_OPTION_PIC */
#else /* FT_CONFIG_OPTION_PIC */

#define FT_DEFINE_RASTER_FUNCS(class_, glyph_format_, raster_new_, \
raster_reset_, raster_set_mode_, raster_render_, raster_done_) \
Expand All @@ -1031,9 +1031,9 @@ FT_BEGIN_HEADER
clazz->raster_set_mode = raster_set_mode_; \
clazz->raster_render = raster_render_; \
clazz->raster_done = raster_done_; \
}
}

#endif /* FT_CONFIG_OPTION_PIC */
#endif /* FT_CONFIG_OPTION_PIC */

/*************************************************************************/
/*************************************************************************/
Expand Down Expand Up @@ -1072,7 +1072,7 @@ FT_BEGIN_HEADER
size_, format_, init_, done_, copy_, transform_, bbox_, prepare_ \
};

#else /* FT_CONFIG_OPTION_PIC */
#else /* FT_CONFIG_OPTION_PIC */

#define FT_DEFINE_GLYPH(class_, size_, format_, init_, done_, copy_, \
transform_, bbox_, prepare_) \
Expand All @@ -1087,9 +1087,9 @@ FT_BEGIN_HEADER
clazz->glyph_transform = transform_; \
clazz->glyph_bbox = bbox_; \
clazz->glyph_prepare = prepare_; \
}
}

#endif /* FT_CONFIG_OPTION_PIC */
#endif /* FT_CONFIG_OPTION_PIC */

/*************************************************************************/
/* */
Expand Down Expand Up @@ -1150,7 +1150,7 @@ FT_BEGIN_HEADER
raster_class_ \
};

#else /* FT_CONFIG_OPTION_PIC */
#else /* FT_CONFIG_OPTION_PIC */

#define FT_DECLARE_RENDERER(class_) FT_DECLARE_MODULE(class_)

Expand Down Expand Up @@ -1205,11 +1205,11 @@ FT_BEGIN_HEADER
\
*output_class = (FT_Module_Class*)clazz; \
return FT_Err_Ok; \
}
}



#endif /* FT_CONFIG_OPTION_PIC */
#endif /* FT_CONFIG_OPTION_PIC */

/*************************************************************************/
/*************************************************************************/
Expand Down Expand Up @@ -1367,7 +1367,7 @@ FT_BEGIN_HEADER
\
clazz->root.module_init = init_; \
clazz->root.module_done = done_; \
clazz->root.get_interface = get_interface_;
clazz->root.get_interface = get_interface_;

#define FT_DEFINE_MODULE(class_, flags_, size_, name_, version_, requires_, \
interface_, init_, done_, get_interface_) \
Expand Down Expand Up @@ -1415,7 +1415,7 @@ FT_BEGIN_HEADER
\
*output_class = clazz; \
return FT_Err_Ok; \
}
}

#endif /* FT_CONFIG_OPTION_PIC */

Expand Down
18 changes: 9 additions & 9 deletions FreeType/include/freetype/internal/ftpic.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#ifndef __FTPIC_H__
#define __FTPIC_H__


FT_BEGIN_HEADER

#ifdef FT_CONFIG_OPTION_PIC
Expand All @@ -36,14 +36,14 @@ FT_BEGIN_HEADER
/* pic containers for base */
void* base;
/* pic containers for modules */
void* autofit;
void* cff;
void* pshinter;
void* psnames;
void* raster;
void* sfnt;
void* smooth;
void* truetype;
void* autofit;
void* cff;
void* pshinter;
void* psnames;
void* raster;
void* sfnt;
void* smooth;
void* truetype;
} FT_PIC_Container;

/* Initialize the various function tables, structs, etc. stored in the container. */
Expand Down
16 changes: 8 additions & 8 deletions FreeType/include/freetype/internal/ftserv.h
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ FT_BEGIN_HEADER
{NULL, NULL} \
};

#else /* FT_CONFIG_OPTION_PIC */
#else /* FT_CONFIG_OPTION_PIC */

#define FT_DEFINE_SERVICEDESCREC1(class_, serv_id_1, serv_data_1) \
void \
Expand Down Expand Up @@ -274,7 +274,7 @@ FT_BEGIN_HEADER
clazz[1].serv_data = NULL; \
*output_class = clazz; \
return FT_Err_Ok; \
}
}

#define FT_DEFINE_SERVICEDESCREC2(class_, serv_id_1, serv_data_1, \
serv_id_2, serv_data_2) \
Expand Down Expand Up @@ -305,7 +305,7 @@ FT_BEGIN_HEADER
clazz[2].serv_data = NULL; \
*output_class = clazz; \
return FT_Err_Ok; \
}
}

#define FT_DEFINE_SERVICEDESCREC3(class_, serv_id_1, serv_data_1, \
serv_id_2, serv_data_2, serv_id_3, serv_data_3) \
Expand Down Expand Up @@ -338,7 +338,7 @@ FT_BEGIN_HEADER
clazz[3].serv_data = NULL; \
*output_class = clazz; \
return FT_Err_Ok; \
}
}

#define FT_DEFINE_SERVICEDESCREC4(class_, serv_id_1, serv_data_1, \
serv_id_2, serv_data_2, serv_id_3, serv_data_3, \
Expand Down Expand Up @@ -374,7 +374,7 @@ FT_BEGIN_HEADER
clazz[4].serv_data = NULL; \
*output_class = clazz; \
return FT_Err_Ok; \
}
}

#define FT_DEFINE_SERVICEDESCREC5(class_, serv_id_1, serv_data_1, \
serv_id_2, serv_data_2, serv_id_3, serv_data_3, serv_id_4, \
Expand Down Expand Up @@ -412,7 +412,7 @@ FT_BEGIN_HEADER
clazz[5].serv_data = NULL; \
*output_class = clazz; \
return FT_Err_Ok; \
}
}

#define FT_DEFINE_SERVICEDESCREC6(class_, serv_id_1, serv_data_1, \
serv_id_2, serv_data_2, serv_id_3, serv_data_3, \
Expand Down Expand Up @@ -453,8 +453,8 @@ FT_BEGIN_HEADER
clazz[6].serv_data = NULL; \
*output_class = clazz; \
return FT_Err_Ok; \
}
#endif /* FT_CONFIG_OPTION_PIC */
}
#endif /* FT_CONFIG_OPTION_PIC */

/*
* Parse a list of FT_ServiceDescRec descriptors and look for
Expand Down
6 changes: 3 additions & 3 deletions FreeType/include/freetype/internal/pshints.h
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ FT_BEGIN_HEADER
get_globals_funcs_, get_t1_funcs_, get_t2_funcs_ \
};

#else /* FT_CONFIG_OPTION_PIC */
#else /* FT_CONFIG_OPTION_PIC */

#define FT_DEFINE_PSHINTER_INTERFACE(class_, get_globals_funcs_, \
get_t1_funcs_, get_t2_funcs_) \
Expand All @@ -700,9 +700,9 @@ FT_BEGIN_HEADER
clazz->get_globals_funcs = get_globals_funcs_; \
clazz->get_t1_funcs = get_t1_funcs_; \
clazz->get_t2_funcs = get_t2_funcs_; \
}
}

#endif /* FT_CONFIG_OPTION_PIC */
#endif /* FT_CONFIG_OPTION_PIC */

FT_END_HEADER

Expand Down
6 changes: 3 additions & 3 deletions FreeType/include/freetype/internal/services/svbdf.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@ FT_BEGIN_HEADER
get_charset_id_, get_property_ \
};

#else /* FT_CONFIG_OPTION_PIC */
#else /* FT_CONFIG_OPTION_PIC */

#define FT_DEFINE_SERVICE_BDFRec(class_, get_charset_id_, get_property_) \
void \
FT_Init_Class_##class_( FT_Service_BDFRec* clazz ) \
{ \
clazz->get_charset_id = get_charset_id_; \
clazz->get_property = get_property_; \
}
}

#endif /* FT_CONFIG_OPTION_PIC */
#endif /* FT_CONFIG_OPTION_PIC */

/* */

Expand Down
6 changes: 3 additions & 3 deletions FreeType/include/freetype/internal/services/svcid.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ FT_BEGIN_HEADER
get_ros_, get_is_cid_, get_cid_from_glyph_index_ \
};

#else /* FT_CONFIG_OPTION_PIC */
#else /* FT_CONFIG_OPTION_PIC */

#define FT_DEFINE_SERVICE_CIDREC(class_, get_ros_, \
get_is_cid_, get_cid_from_glyph_index_ ) \
Expand All @@ -67,9 +67,9 @@ FT_BEGIN_HEADER
clazz->get_ros = get_ros_; \
clazz->get_is_cid = get_is_cid_; \
clazz->get_cid_from_glyph_index = get_cid_from_glyph_index_; \
}
}

#endif /* FT_CONFIG_OPTION_PIC */
#endif /* FT_CONFIG_OPTION_PIC */

/* */

Expand Down
6 changes: 3 additions & 3 deletions FreeType/include/freetype/internal/services/svgldict.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ FT_BEGIN_HEADER
get_name_, name_index_ \
};

#else /* FT_CONFIG_OPTION_PIC */
#else /* FT_CONFIG_OPTION_PIC */

#define FT_DEFINE_SERVICE_GLYPHDICTREC(class_, get_name_, name_index_) \
void \
Expand All @@ -69,9 +69,9 @@ FT_BEGIN_HEADER
FT_UNUSED(library); \
clazz->get_name = get_name_; \
clazz->name_index = name_index_; \
}
}

#endif /* FT_CONFIG_OPTION_PIC */
#endif /* FT_CONFIG_OPTION_PIC */

/* */

Expand Down
6 changes: 3 additions & 3 deletions FreeType/include/freetype/internal/services/svmm.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ FT_BEGIN_HEADER
get_mm_, set_mm_design_, set_mm_blend_, get_mm_var_, set_var_design_ \
};

#else /* FT_CONFIG_OPTION_PIC */
#else /* FT_CONFIG_OPTION_PIC */

#define FT_DEFINE_SERVICE_MULTIMASTERSREC(class_, get_mm_, set_mm_design_, \
set_mm_blend_, get_mm_var_, set_var_design_) \
Expand All @@ -89,9 +89,9 @@ FT_BEGIN_HEADER
clazz->set_mm_blend = set_mm_blend_; \
clazz->get_mm_var = get_mm_var_; \
clazz->set_var_design = set_var_design_; \
}
}

#endif /* FT_CONFIG_OPTION_PIC */
#endif /* FT_CONFIG_OPTION_PIC */

/* */

Expand Down
6 changes: 3 additions & 3 deletions FreeType/include/freetype/internal/services/svpostnm.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ FT_BEGIN_HEADER
get_ps_font_name_ \
};

#else /* FT_CONFIG_OPTION_PIC */
#else /* FT_CONFIG_OPTION_PIC */

#define FT_DEFINE_SERVICE_PSFONTNAMEREC(class_, get_ps_font_name_) \
void \
Expand All @@ -63,9 +63,9 @@ FT_BEGIN_HEADER
{ \
FT_UNUSED(library); \
clazz->get_ps_font_name = get_ps_font_name_; \
}
}

#endif /* FT_CONFIG_OPTION_PIC */
#endif /* FT_CONFIG_OPTION_PIC */

/* */

Expand Down
Loading