--- ./src/gdevpsf2.c.org	2005-10-03 18:36:30.000000000 +0900
+++ ./src/gdevpsf2.c	2005-10-05 10:23:59.000000000 +0900
@@ -1697,7 +1697,7 @@
     offset = stell(writer.strm) - start_pos;
     if_debug2('l', "[l]GSubrs = %u => %u\n", GSubrs_offset, offset);
     if (offset > GSubrs_offset)
-	return_error(gs_error_rangecheck);
+	gs_note_error(gs_error_rangecheck);
     GSubrs_offset = offset;
     if (gsubrs_count == 0)
 	cff_put_Index_header(&writer, 0, 0);
@@ -1712,7 +1712,7 @@
     offset = stell(writer.strm) - start_pos;
     if_debug2('l', "[l]FDSelect = %u => %u\n", FDSelect_offset, offset);
     if (offset > FDSelect_offset)
-	return_error(offset_error("FDselect"));
+	gs_note_error(offset_error("FDselect"));
     FDSelect_offset = offset;
     cff_write_FDSelect(&writer, &genum, fdselect_size, fdselect_format);
 
@@ -1720,7 +1720,7 @@
     offset = stell(writer.strm) - start_pos;
     if_debug2('l', "[l]CharStrings = %u => %u\n", CharStrings_offset, offset);
     if (offset > CharStrings_offset)
-	return_error(offset_error("CharStrings"));
+	gs_note_error(offset_error("CharStrings"));
     CharStrings_offset = offset;
     cff_write_CharStrings(&writer, &genum, charstrings_count,
 			  charstrings_size);
@@ -1729,13 +1729,13 @@
     offset = stell(writer.strm) - start_pos;
     if_debug2('l', "[l]Font = %u => %u\n", Font_offset, offset);
     if (offset > Font_offset)
-	return_error(offset_error("Font"));
+	gs_note_error(offset_error("Font"));
     Font_offset = offset;
     cff_write_FDArray_offsets(&writer, FDArray_offsets, num_fonts);
     offset = stell(writer.strm) - start_pos;
     if_debug2('l', "[l]FDArray[0] = %u => %u\n", FDArray_offsets[0], offset);
     if (offset > FDArray_offsets[0])
-	return_error(offset_error("FDArray[0]"));
+	gs_note_error(offset_error("FDArray[0]"));
     FDArray_offsets[0] = offset;
     for (j = 0; j < num_fonts; ++j) {
 	gs_font_type1 *pfd = pfont->cidata.FDArray[j];
@@ -1752,7 +1752,7 @@
 	if_debug3('l', "[l]FDArray[%d] = %u => %u\n", j + 1,
 		  FDArray_offsets[j + 1], offset);
 	if (offset > FDArray_offsets[j + 1])
-	    return_error(offset_error("FDArray"));
+	    gs_note_error(offset_error("FDArray"));
 	FDArray_offsets[j + 1] = offset;
     }
 
@@ -1764,7 +1764,7 @@
 	if_debug3('l', "[l]Private[%d] = %u => %u\n",
 		  j, Private_offsets[j], offset);
 	if (offset > Private_offsets[j])
-	    return_error(offset_error("Private"));
+	    gs_note_error(offset_error("Private"));
 	Private_offsets[j] = offset;
 	if (j == num_fonts)
 	    break;
@@ -1781,7 +1781,7 @@
 	if_debug3('l', "[l]Subrs[%d] = %u => %u\n",
 		  j, Subrs_offsets[j], offset);
 	if (offset > Subrs_offsets[j])
-	    return_error(offset_error("Subrs"));
+	    gs_note_error(offset_error("Subrs"));
 	Subrs_offsets[j] = offset;
 	if (j == num_fonts)
 	    break;
@@ -1796,7 +1796,7 @@
     offset = stell(writer.strm) - start_pos;
     if_debug2('l', "[l]End = %u => %u\n", End_offset, offset);
     if (offset > End_offset)
-	return_error(offset_error("End"));
+	gs_note_error(offset_error("End"));
     if (offset == End_offset) {
 	/* The iteration has converged.  Write the result. */
 	if (writer.strm == &poss) {