Attachment #6563 for bug #12307

View | Details | Raw Unified | Return to bug 12307
Collapse All | Expand All

Lines 294-300 Link Here

(-)../zinf-2.2.0/plm/metadata/id3v2/io_helpers.cpp (-1 / +1 lines)
294	{	294	{
295	ID3_Writer::pos_type beg = writer.getCur();	295	ID3_Writer::pos_type beg = writer.getCur();
296	ID3_Writer::size_type strLen = buf.size();	296	ID3_Writer::size_type strLen = buf.size();
297	ID3_Writer::size_type size = min(len, strLen);	297	ID3_Writer::size_type size = min((uint32)len, strLen);
298	writer.writeChars(buf.data(), size);	298	writer.writeChars(buf.data(), size);
299	for (; size < len; ++size)	299	for (; size < len; ++size)
300	{	300	{

Lines 73-79 Link Here

(-)../zinf-2.2.0/plm/metadata/id3v2/io_helpers.h (-1 / +1 lines)
73	size_t writeUnicodeString(ID3_Writer&, String, bool = true);	73	size_t writeUnicodeString(ID3_Writer&, String, bool = true);
74	size_t writeUnicodeText(ID3_Writer&, String, bool = true);	74	size_t writeUnicodeText(ID3_Writer&, String, bool = true);
75	size_t writeBENumber(ID3_Writer&, uint32 val, size_t);	75	size_t writeBENumber(ID3_Writer&, uint32 val, size_t);
76	size_t writeTrailingSpaces(ID3_Writer&, String, size_t);	76	uint32 writeTrailingSpaces(ID3_Writer&, String, size_t);
77	size_t writeUInt28(ID3_Writer&, uint32);	77	size_t writeUInt28(ID3_Writer&, uint32);
78	};	78	};
79	};	79	};




      }
      virtual size_type readChars(char_type buf[], size_type len)
      {
        size_type size = min((uint32)len, (uint32)(_string.size() - _cur));
        _string.copy(reinterpret_cast<String::value_type *>(buf), size, _cur);
        _cur += size;
        return size;


      virtual size_type skipChars(size_type len)
      {
        size_type size = min(len, (uint32)(_string.size() - _cur));
        _cur += size;
        return size;
      }

      }
      virtual size_type readChars(char_type buf[], size_type len)
      {
        size_type size = min(len, (uint32)(_string.size() - _cur));
        _string.copy(reinterpret_cast<BString::value_type *>(buf), size, _cur);
        _cur += size;
        return size;


      virtual size_type skipChars(size_type len)
      {
        size_type size = min(len, (uint32)(_string.size() - _cur));
        _cur += size;
        return size;
      }

Return to bug 12307

Lines 63-69 Link Here

(-)../zinf-2.2.0/plm/metadata/id3v2/io_strings.h (-4 / +4 lines)
63	}	63	}
64	virtual size_type readChars(char_type buf[], size_type len)	64	virtual size_type readChars(char_type buf[], size_type len)
65	{	65	{
66	size_type size = min(len, _string.size() - _cur);	66	size_type size = min((uint32)len, (uint32)(_string.size() - _cur));
67	_string.copy(reinterpret_cast<String::value_type *>(buf), size, _cur);	67	_string.copy(reinterpret_cast<String::value_type *>(buf), size, _cur);
68	_cur += size;	68	_cur += size;
69	return size;	69	return size;
Lines 100-106 Link Here
100		100
101	virtual size_type skipChars(size_type len)	101	virtual size_type skipChars(size_type len)
102	{	102	{
103	size_type size = min(len, _string.size() - _cur);	103	size_type size = min(len, (uint32)(_string.size() - _cur));
104	_cur += size;	104	_cur += size;
105	return size;	105	return size;
106	}	106	}
Lines 133-139 Link Here
133	}	133	}
134	virtual size_type readChars(char_type buf[], size_type len)	134	virtual size_type readChars(char_type buf[], size_type len)
135	{	135	{
136	size_type size = min(len, _string.size() - _cur);	136	size_type size = min(len, (uint32)(_string.size() - _cur));
137	_string.copy(reinterpret_cast<BString::value_type *>(buf), size, _cur);	137	_string.copy(reinterpret_cast<BString::value_type *>(buf), size, _cur);
138	_cur += size;	138	_cur += size;
139	return size;	139	return size;
Lines 170-176 Link Here
170		170
171	virtual size_type skipChars(size_type len)	171	virtual size_type skipChars(size_type len)
172	{	172	{
173	size_type size = min(len, _string.size() - _cur);	173	size_type size = min(len, (uint32)(_string.size() - _cur));
174	_cur += size;	174	_cur += size;
175	return size;	175	return size;
176	}	176	}