Subversion Repositories tpanel

Rev

Rev 75 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 75 Rev 76
Line 757... Line 757...
757
                }
757
                }
758
 
758
 
759
                if (segment == 0xffff || form.startCode[segment] == 0xffff || form.endCode[segment] == 0xffff)
759
                if (segment == 0xffff || form.startCode[segment] == 0xffff || form.endCode[segment] == 0xffff)
760
                {
760
                {
761
                    MSG_WARNING("The character " << std::hex << std::setw(4) << std::setfill('0') << lCh << " is not supported by any segment!" << std::dec);
761
                    MSG_WARNING("The character " << std::hex << std::setw(4) << std::setfill('0') << lCh << " is not supported by any segment!" << std::dec);
-
 
762
                    continue;
762
                    return 0xffff;
763
//                    return 0xffff;
763
                }
764
                }
764
 
765
 
765
                MSG_DEBUG("Table: " << nTbs << ": idRangeOffset: " << std::hex << std::setw(4) << std::setfill('0') << form.idRangeOffset[segment] << ", idDelta: " << std::setw(4) << std::setfill('0') << form.idDelta[segment] << std::dec);
766
                MSG_DEBUG("Table: " << (nTbs+1) << ": idRangeOffset: " << std::hex << std::setw(4) << std::setfill('0') << form.idRangeOffset[segment] << ", idDelta: " << std::setw(4) << std::setfill('0') << form.idDelta[segment] << std::dec);
766
                uint16_t glyphIndex;
767
                uint16_t glyphIndex;
767
 
768
 
768
                if (form.idRangeOffset[segment] == 0)
769
                if (form.idRangeOffset[segment] == 0)
769
                    glyphIndex = form.idDelta[segment] + lCh;
770
                    glyphIndex = form.idDelta[segment] + lCh;
770
                else
771
                else
Line 779... Line 780...
779
                }
780
                }
780
 
781
 
781
                MSG_DEBUG("Found index 0x" << std::hex << std::setw(4) << std::setfill('0') << glyphIndex << " for unichar 0x" << std::setw(4) << std::setfill('0') << lCh << std::dec);
782
                MSG_DEBUG("Found index 0x" << std::hex << std::setw(4) << std::setfill('0') << glyphIndex << " for unichar 0x" << std::setw(4) << std::setfill('0') << lCh << std::dec);
782
                return glyphIndex;
783
                return glyphIndex;
783
            }
784
            }
-
 
785
            else
-
 
786
            {
-
 
787
                MSG_WARNING("Ignoring table with unsupported format " << _cmapTable.subtables[nTbs].format.format);
-
 
788
            }
784
        }
789
        }
785
    }
790
    }
786
 
791
 
787
    return 0xffff;
792
    return 0xffff;
788
}
793
}