Attachment #2614 for bug #5618

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

Lines 281-287 Link Here

(-)audacity-src-1.0.0.old/id3lib/src/tag_file.cpp (-2 / +2 lines)
281	//ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file");	281	//ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file");
282	}	282	}
283		283
284	ofstream tmpOut(fd);	284	ofstream tmpOut(sTempFile);
285	if (!tmpOut)	285	if (!tmpOut)
286	{	286	{
287	tmpOut.close();	287	tmpOut.close();
Lines 293-299 Link Here
293		293
294	tmpOut.write(tagData, tagSize);	294	tmpOut.write(tagData, tagSize);
295	file.seekg(tag.GetPrependedBytes(), ios::beg);	295	file.seekg(tag.GetPrependedBytes(), ios::beg);
296	uchar tmpBuffer[BUFSIZ];	296	char tmpBuffer[BUFSIZ];
297	while (file)	297	while (file)
298	{	298	{
299	file.read(tmpBuffer, BUFSIZ);	299	file.read(tmpBuffer, BUFSIZ);




#define NOCREATE ((std::ios_base::openmode)0)
#define toascii(X) (X)
#else
//#define NOCREATE ios::nocreate
#define NOCREATE ios::in
#endif

#include "utils.h"

    size_t source_size = source.size();
//    const char* source_str = source.data();
    char * source_str = new char[source.length()+1]; 
    source.copy(source_str, String::npos); 
    source_str[source.length()] = 0; 

#define BUFSIZ 1024

  size_t size = 0;
  if (file.is_open())
  {
    int curpos = file.tellg();
    file.seekg(0, ios::end);
    size = file.tellg();
    file.seekg(curpos);

  size_t size = 0;
  if (file.is_open())
  {
    int curpos = file.tellg();
    file.seekg(0, ios::end);
    size = file.tellg();
    file.seekg(curpos);

  size_t size = 0;
  if (file.is_open())
  {
    int curpos = file.tellp();
    file.seekp(0, ios::end);
    size = file.tellp();
    file.seekp(curpos);

Return to bug 5618

Lines 40-46 Link Here

(-)audacity-src-1.0.0.old/id3lib/src/utils.cpp (-5 / +6 lines)
40	#define NOCREATE ((std::ios_base::openmode)0)	40	#define NOCREATE ((std::ios_base::openmode)0)
41	#define toascii(X) (X)	41	#define toascii(X) (X)
42	#else	42	#else
43	#define NOCREATE ios::nocreate	43	//#define NOCREATE ios::nocreate
		44	#define NOCREATE ios::in
44	#endif	45	#endif
45		46
46	#include "utils.h"	47	#include "utils.h"
Lines 106-112 Link Here
106	size_t source_size = source.size();	107	size_t source_size = source.size();
107	// const char* source_str = source.data();	108	// const char* source_str = source.data();
108	char * source_str = new char[source.length()+1];	109	char * source_str = new char[source.length()+1];
109	source.copy(source_str, string::npos);	110	source.copy(source_str, String::npos);
110	source_str[source.length()] = 0;	111	source_str[source.length()] = 0;
111		112
112	#define BUFSIZ 1024	113	#define BUFSIZ 1024
Lines 242-248 Link Here
242	size_t size = 0;	243	size_t size = 0;
243	if (file.is_open())	244	if (file.is_open())
244	{	245	{
245	streamoff curpos = file.tellg();	246	int curpos = file.tellg();
246	file.seekg(0, ios::end);	247	file.seekg(0, ios::end);
247	size = file.tellg();	248	size = file.tellg();
248	file.seekg(curpos);	249	file.seekg(curpos);
Lines 255-261 Link Here
255	size_t size = 0;	256	size_t size = 0;
256	if (file.is_open())	257	if (file.is_open())
257	{	258	{
258	streamoff curpos = file.tellg();	259	int curpos = file.tellg();
259	file.seekg(0, ios::end);	260	file.seekg(0, ios::end);
260	size = file.tellg();	261	size = file.tellg();
261	file.seekg(curpos);	262	file.seekg(curpos);
Lines 268-274 Link Here
268	size_t size = 0;	269	size_t size = 0;
269	if (file.is_open())	270	if (file.is_open())
270	{	271	{
271	streamoff curpos = file.tellp();	272	int curpos = file.tellp();
272	file.seekp(0, ios::end);	273	file.seekp(0, ios::end);
273	size = file.tellp();	274	size = file.tellp();
274	file.seekp(curpos);	275	file.seekp(curpos);