commit 486bf01f6cca4fb29f045a2fabf3bb5499b54225
from: Pompolic <pompolic@special-circumstanc.es>
date: Wed Jul 29 19:08:08 2020 UTC

Remove "jpgmagic" from marker segment definitions

Also making naming consistent: app0_marker instead of app0marker

commit - fddef8f7e9cd93d937ddd2a56342e77522b7ce03
commit + 486bf01f6cca4fb29f045a2fabf3bb5499b54225
blob - 275d77479affe9b84f478debf814b51fa73ba5d7
blob + ec720ca7c17d42c5ede8a5370888ba55ce9ea0da
--- pdf.c
+++ pdf.c
@@ -905,13 +905,13 @@ init_dct_parser(struct Env *aux)
 	H_RULE(app0_rgb, h_repeat_n(h_uint8(), 3));
 	H_RULE(app0_rgb_n, h_many(app0_rgb));
 
-	H_RULE(app0, SEQ(jpgmagic, app0_marker, app0_length, app0_magic, app0_vmajor, app0_vminor, app0_densityunits,
+	H_RULE(app0, SEQ(app0_marker, app0_length, app0_magic, app0_vmajor, app0_vminor, app0_densityunits,
 			app0_densityx, app0_densityy, app0_thumbnailx, app0_thumbnaily, app0_rgb_n));
 
 	H_RULE(app1_marker, h_ch('\xE1'));
 	H_RULE(app1_zero, h_ch('\0'));
 	H_RULE(app1_exifdata, h_many(h_uint8()));
-	H_RULE(app1, SEQ(jpgmagic, app1_marker, app1_zero, app1_exifdata));
+	H_RULE(app1, SEQ(app1_marker, app1_zero, app1_exifdata));
 
 	H_RULE(sof0_marker, h_ch('\xC0'));
 	/* Bits per sample */
@@ -928,13 +928,13 @@ init_dct_parser(struct Env *aux)
 	/* Rule for the component itself */
 	H_RULE(sof0_component_lv, h_length_value(sof0_numcomponents, sof0_component));
 
-	H_RULE(sof0, SEQ(jpgmagic, sof0_marker, sof0_bps, sof0_imgheight, sof0_imgwidth, sof0_component_lv));
+	H_RULE(sof0, SEQ(sof0_marker, sof0_bps, sof0_imgheight, sof0_imgwidth, sof0_component_lv));
 
 
-	H_RULE(soimarker, h_ch('\xD8'));
+	H_RULE(soi_marker, h_ch('\xD8'));
 
 	/* start of scan marker segment */
-	H_RULE(sosmarker, h_ch('\xDA'));
+	H_RULE(sos_marker, h_ch('\xDA'));
 
 	/* length-value array of components begins here */
 	H_RULE(sos_numcomponents, h_uint8());
@@ -953,13 +953,13 @@ init_dct_parser(struct Env *aux)
 	H_RULE(sos_approxbitpos, h_uint8());
 
 	/* Final SOS segment parser */
-	H_RULE(sos, SEQ(jpgmagic, sosmarker, sos_component_lv, sos_startspectral, sos_endspectral, sos_approxbitpos));
+	H_RULE(sos, SEQ(sos_marker, sos_component_lv, sos_startspectral, sos_endspectral, sos_approxbitpos));
 
 	// XXX rest of the markers
 
 	// XXX for now this is to prevent unused variable errors when compiling
 	//H_ARULE(dct, SEQ(jpgmagic, app0, sos));
-	H_RULE(dct, SEQ(jpgmagic, app0, sos, soimarker, sof0, app1));
+	H_RULE(dct, SEQ(jpgmagic, app0, sos, soi_marker, sof0, app1));
 
 	p_dct = dct;
 }