← Back to branch summary

~ubuntu-branches/ubuntu/precise/gle-graphics/precise

« back to all changes in this revision

Viewing changes to src/gle/pass.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Christian T. Steigies
  • Date: 2010-02-24 23:21:37 UTC
  • mfrom: (2.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20100224232137-f0qfufkxcr2tr1m5
Tags: 4.2.2-2
* upload to unstable
* Updated Standards-Version to 3.8.4 (no changes)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gle/pass.cpp
894
894
        }
895
895
        pcode.addInt(8);
896
896
        int count = get_nb_fonts();
897
 
        for (int i = 1; i <= count; i++) {
 
897
        // font zero is a dummy!
 
898
        for (int i = 1; i < count; i++) {
898
899
                const char* name = get_font_name(i);
899
900
                if (str_i_equals(name, token.c_str())) {
900
901
                        pcode.addInt(i);
904
905
        stringstream strm;
905
906
        strm << "invalid font name {" << token << "}, expecting one of:";
906
907
        int idx = 0;
907
 
        for (int i = 1; i <= count; i++) {
 
908
        for (int i = 1; i < count; i++) {
908
909
                if (idx % 5 == 0) {
909
910
                        strm << endl << "       ";
910
911
                } else {
913
914
                if (get_font_name(i) != NULL) {
914
915
                        strm << get_font_name(i);
915
916
                        bool has_more = false;
916
 
                        for (int j = i+1; j <= count; j++) {
 
917
                        for (int j = i+1; j < count; j++) {
917
918
                                if (get_font_name(j) != NULL) {
918
919
                                        has_more = true;
919
920
                                        break;
2190
2191
        { "FCIRCLE",  "GLEMARK", 8,-.5,-.5,0.7,      false },   /* fcircle */
2191
2192
        { "FSQUARE",  "GLEMARK", 5,-.5,-.5,0.7,      false },   /* fsquare */
2192
2193
        { "FTRIANGLE","GLEMARK", 2,-.5,-.433,0.7,    false },   /* ftriangle */
2193
 
        { "FDIAMOND", "GLEMARK", 11,-.5,-.7,0.7,     false },   /* fdiamond */
 
2194
        { "FDIAMOND", "GLEMARK", 11,-.5,-.5,0.7,     false },   /* fdiamond */
2194
2195
        { "CIRCLE",   "GLEMARK", 7,-.5,-.5,0.7,      false },   /* circle */
2195
2196
        { "SQUARE",   "GLEMARK", 4,-.5,-.5,0.7,      false },   /* square */
2196
2197
        { "TRIANGLE", "GLEMARK", 1,-.5,-.433,0.7,    false },   /* triangle */
2197
 
        { "DIAMOND",  "GLEMARK", 10,-.5,-.7,0.7,     false },   /* diamond */
 
2198
        { "DIAMOND",  "GLEMARK", 10,-.5,-.5,0.7,     false },   /* diamond */
2198
2199
        { "PLUS",     "TEXCMR",  43,-.375,-.24,1.0,  false },   /* plus, fixed */
2199
2200
        { "CLUB",     "TEXSY",   124,-.38,-.3,1.0,   false },   /* club */
2200
2201
        { "HEART",    "TEXSY",   126,-.38,-.34,1.0,  false },   /* heart */
2215
2216
        { "WCIRCLE",  "GLEMARK", 9,-.5,-.5,0.7,      false },   /* wcircle */
2216
2217
        { "WTRIANGLE","GLEMARK", 3,-.5,-.433,0.7,    false },   /* wtriangle */
2217
2218
        { "WSQUARE",  "GLEMARK", 6,-.5,-.5,0.7,      false },   /* wsquare */
2218
 
        { "WDIAMOND", "GLEMARK", 12,-.5,-.7,0.7,     false },   /* wdiamond */
 
2219
        { "WDIAMOND", "GLEMARK", 12,-.5,-.5,0.7,     false },   /* wdiamond */
2219
2220
        { "PLANE",    "PSZD",    40,0.0,0.0,1.0,     false },   /* ZapDingbats */
2220
2221
        { "HANDPEN",  "PSZD",    45,0.0,0.0,1.0,     false },   /* ZapDingbats */
2221
2222
        { "SCIRCLE",  "PSZD",    109,0.0,0.0,1.0,    false },   /* ZapDingbats */