Remove need for namedump by using macros and preprocessor.

Add a PDF_NAME(Foo) macro that evaluates to a pdf_obj for /Foo.
Use the C preprocessor to create the enum values and string table
from one include file instead of using a separate code generator tool.

1 files changed, 32 insertions, 32 deletions

diff --git a/source/pdf/pdf-colorspace.c b/source/pdf/pdf-colorspace.c
index 44615977..ec4da7b0 100644
--- a/source/pdf/pdf-colorspace.c
+++ b/source/pdf/pdf-colorspace.c
@@ -31,7 +31,7 @@ load_icc_based(fz_context *ctx, pdf_obj *dict, int alt)
 	*/
 	fz_try(ctx)
 	{
-		obj = pdf_dict_get(ctx, dict, PDF_NAME_Alternate);
+		obj = pdf_dict_get(ctx, dict, PDF_NAME(Alternate));
 		if (obj)
 		{
 			cs_alt = pdf_load_colorspace(ctx, obj);
@@ -52,7 +52,7 @@ load_icc_based(fz_context *ctx, pdf_obj *dict, int alt)
 		cs_alt = NULL;
 	}
 
-	n = pdf_to_int(ctx, pdf_dict_get(ctx, dict, PDF_NAME_N));
+	n = pdf_to_int(ctx, pdf_dict_get(ctx, dict, PDF_NAME(N)));
 
 	fz_try(ctx)
 	{
@@ -314,7 +314,7 @@ pdf_load_cal_common(fz_context *ctx, pdf_obj *dict, float *wp, float *bp, float
 	pdf_obj *obj;
 	int i;
 
-	obj = pdf_dict_get(ctx, dict, PDF_NAME_WhitePoint);
+	obj = pdf_dict_get(ctx, dict, PDF_NAME(WhitePoint));
 	if (pdf_array_len(ctx, obj) != 3)
 		fz_throw(ctx, FZ_ERROR_SYNTAX, "WhitePoint must be a 3-element array");
 
@@ -327,7 +327,7 @@ pdf_load_cal_common(fz_context *ctx, pdf_obj *dict, float *wp, float *bp, float
 	if (wp[1] != 1)
 		fz_throw(ctx, FZ_ERROR_SYNTAX, "WhitePoint Yw must be 1.0");
 
-	obj = pdf_dict_get(ctx, dict, PDF_NAME_BlackPoint);
+	obj = pdf_dict_get(ctx, dict, PDF_NAME(BlackPoint));
 	if (pdf_array_len(ctx, obj) == 3)
 	{
 		for (i = 0; i < 3; i++)
@@ -338,7 +338,7 @@ pdf_load_cal_common(fz_context *ctx, pdf_obj *dict, float *wp, float *bp, float
 		}
 	}
 
-	obj = pdf_dict_get(ctx, dict, PDF_NAME_Gamma);
+	obj = pdf_dict_get(ctx, dict, PDF_NAME(Gamma));
 	if (pdf_is_number(ctx, obj))
 	{
 		gamma[0] = pdf_to_real(ctx, obj);
@@ -394,7 +394,7 @@ pdf_load_cal_rgb(fz_context *ctx, pdf_obj *dict)
 	{
 		pdf_load_cal_common(ctx, dict, wp, bp, gamma);
 
-		obj = pdf_dict_get(ctx, dict, PDF_NAME_Matrix);
+		obj = pdf_dict_get(ctx, dict, PDF_NAME(Matrix));
 		if (pdf_array_len(ctx, obj) == 9)
 		{
 			for (i = 0; i < 9; i++)
@@ -416,19 +416,19 @@ pdf_load_colorspace_imp(fz_context *ctx, pdf_obj *obj)
 
 	if (pdf_is_name(ctx, obj))
 	{
-		if (pdf_name_eq(ctx, obj, PDF_NAME_Pattern))
+		if (pdf_name_eq(ctx, obj, PDF_NAME(Pattern)))
 			return fz_keep_colorspace(ctx, fz_device_gray(ctx));
-		else if (pdf_name_eq(ctx, obj, PDF_NAME_G))
+		else if (pdf_name_eq(ctx, obj, PDF_NAME(G)))
 			return fz_keep_colorspace(ctx, fz_device_gray(ctx));
-		else if (pdf_name_eq(ctx, obj, PDF_NAME_RGB))
+		else if (pdf_name_eq(ctx, obj, PDF_NAME(RGB)))
 			return fz_keep_colorspace(ctx, fz_device_rgb(ctx));
-		else if (pdf_name_eq(ctx, obj, PDF_NAME_CMYK))
+		else if (pdf_name_eq(ctx, obj, PDF_NAME(CMYK)))
 			return fz_keep_colorspace(ctx, fz_device_cmyk(ctx));
-		else if (pdf_name_eq(ctx, obj, PDF_NAME_DeviceGray))
+		else if (pdf_name_eq(ctx, obj, PDF_NAME(DeviceGray)))
 			return fz_keep_colorspace(ctx, fz_device_gray(ctx));
-		else if (pdf_name_eq(ctx, obj, PDF_NAME_DeviceRGB))
+		else if (pdf_name_eq(ctx, obj, PDF_NAME(DeviceRGB)))
 			return fz_keep_colorspace(ctx, fz_device_rgb(ctx));
-		else if (pdf_name_eq(ctx, obj, PDF_NAME_DeviceCMYK))
+		else if (pdf_name_eq(ctx, obj, PDF_NAME(DeviceCMYK)))
 			return fz_keep_colorspace(ctx, fz_device_cmyk(ctx));
 		else
 			fz_throw(ctx, FZ_ERROR_SYNTAX, "unknown colorspace: %s", pdf_to_name(ctx, obj));
@@ -441,35 +441,35 @@ pdf_load_colorspace_imp(fz_context *ctx, pdf_obj *obj)
 		if (pdf_is_name(ctx, name))
 		{
 			/* load base colorspace instead */
-			if (pdf_name_eq(ctx, name, PDF_NAME_G))
+			if (pdf_name_eq(ctx, name, PDF_NAME(G)))
 				return fz_keep_colorspace(ctx, fz_device_gray(ctx));
-			else if (pdf_name_eq(ctx, name, PDF_NAME_RGB))
+			else if (pdf_name_eq(ctx, name, PDF_NAME(RGB)))
 				return fz_keep_colorspace(ctx, fz_device_rgb(ctx));
-			else if (pdf_name_eq(ctx, name, PDF_NAME_CMYK))
+			else if (pdf_name_eq(ctx, name, PDF_NAME(CMYK)))
 				return fz_keep_colorspace(ctx, fz_device_cmyk(ctx));
-			else if (pdf_name_eq(ctx, name, PDF_NAME_DeviceGray))
+			else if (pdf_name_eq(ctx, name, PDF_NAME(DeviceGray)))
 				return fz_keep_colorspace(ctx, fz_device_gray(ctx));
-			else if (pdf_name_eq(ctx, name, PDF_NAME_DeviceRGB))
+			else if (pdf_name_eq(ctx, name, PDF_NAME(DeviceRGB)))
 				return fz_keep_colorspace(ctx, fz_device_rgb(ctx));
-			else if (pdf_name_eq(ctx, name, PDF_NAME_DeviceCMYK))
+			else if (pdf_name_eq(ctx, name, PDF_NAME(DeviceCMYK)))
 				return fz_keep_colorspace(ctx, fz_device_cmyk(ctx));
-			else if (pdf_name_eq(ctx, name, PDF_NAME_CalGray))
+			else if (pdf_name_eq(ctx, name, PDF_NAME(CalGray)))
 			{
 				if (fz_get_cmm_engine(ctx))
 					return pdf_load_cal_gray(ctx, pdf_array_get(ctx, obj, 1));
 				else
 					return fz_keep_colorspace(ctx, fz_device_gray(ctx));
 			}
-			else if (pdf_name_eq(ctx, name, PDF_NAME_CalRGB))
+			else if (pdf_name_eq(ctx, name, PDF_NAME(CalRGB)))
 			{
 				if (fz_get_cmm_engine(ctx))
 					return pdf_load_cal_rgb(ctx, pdf_array_get(ctx, obj, 1));
 				else
 					return fz_keep_colorspace(ctx, fz_device_rgb(ctx));
 			}
-			else if (pdf_name_eq(ctx, name, PDF_NAME_CalCMYK))
+			else if (pdf_name_eq(ctx, name, PDF_NAME(CalCMYK)))
 				return fz_keep_colorspace(ctx, fz_device_cmyk(ctx));
-			else if (pdf_name_eq(ctx, name, PDF_NAME_Lab))
+			else if (pdf_name_eq(ctx, name, PDF_NAME(Lab)))
 				return fz_keep_colorspace(ctx, fz_device_lab(ctx));
 			else
 			{
@@ -478,20 +478,20 @@ pdf_load_colorspace_imp(fz_context *ctx, pdf_obj *obj)
 				{
 					if (pdf_mark_obj(ctx, obj))
 						fz_throw(ctx, FZ_ERROR_SYNTAX, "recursive colorspace");
-					if (pdf_name_eq(ctx, name, PDF_NAME_ICCBased))
+					if (pdf_name_eq(ctx, name, PDF_NAME(ICCBased)))
 						cs = load_icc_based(ctx, pdf_array_get(ctx, obj, 1), 1);
 
-					else if (pdf_name_eq(ctx, name, PDF_NAME_Indexed))
+					else if (pdf_name_eq(ctx, name, PDF_NAME(Indexed)))
 						cs = load_indexed(ctx, obj);
-					else if (pdf_name_eq(ctx, name, PDF_NAME_I))
+					else if (pdf_name_eq(ctx, name, PDF_NAME(I)))
 						cs = load_indexed(ctx, obj);
 
-					else if (pdf_name_eq(ctx, name, PDF_NAME_Separation))
+					else if (pdf_name_eq(ctx, name, PDF_NAME(Separation)))
 						cs = load_devicen(ctx, obj);
 
-					else if (pdf_name_eq(ctx, name, PDF_NAME_DeviceN))
+					else if (pdf_name_eq(ctx, name, PDF_NAME(DeviceN)))
 						cs = load_devicen(ctx, obj);
-					else if (pdf_name_eq(ctx, name, PDF_NAME_Pattern))
+					else if (pdf_name_eq(ctx, name, PDF_NAME(Pattern)))
 					{
 						pdf_obj *pobj;
 
@@ -553,8 +553,8 @@ pdf_load_colorspace(fz_context *ctx, pdf_obj *obj)
 static fz_colorspace *
 pdf_load_output_intent(fz_context *ctx, pdf_document *doc)
 {
-	pdf_obj *root = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Root);
-	pdf_obj *intents = pdf_dict_get(ctx, root, PDF_NAME_OutputIntents);
+	pdf_obj *root = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME(Root));
+	pdf_obj *intents = pdf_dict_get(ctx, root, PDF_NAME(OutputIntents));
 	pdf_obj *intent_dict;
 	pdf_obj *dest_profile;
 	fz_colorspace *cs = NULL;
@@ -568,7 +568,7 @@ pdf_load_output_intent(fz_context *ctx, pdf_document *doc)
 	intent_dict = pdf_array_get(ctx, intents, 0);
 	if (!intent_dict)
 		return NULL;
-	dest_profile = pdf_dict_get(ctx, intent_dict, PDF_NAME_DestOutputProfile);
+	dest_profile = pdf_dict_get(ctx, intent_dict, PDF_NAME(DestOutputProfile));
 	if (!dest_profile)
 		return NULL;