olaf neophyte and de.po updates, valgrind tweaks, delete green lady, inkscape dpi=96

[goodguy/history.git] / cinelerra-5.1 / cinelerra / filetga.C

diff --git a/cinelerra-5.1/cinelerra/filetga.C b/cinelerra-5.1/cinelerra/filetga.C
index 0ec8a73b9b6f83e6ee9e475404e54ac6990e1a70..800661e4942858754dc709175690a5bfdb8c65a5 100644 (file)
--- a/cinelerra-5.1/cinelerra/filetga.C
+++ b/cinelerra-5.1/cinelerra/filetga.C
@@ -98,10 +98,8 @@ int FileTGA::check_sig(Asset *asset)
 }
 
 void FileTGA::get_parameters(BC_WindowBase *parent_window,
-               Asset *asset,
-               BC_WindowBase* &format_window,
-               int audio_options,
-               int video_options)
+       Asset *asset, BC_WindowBase* &format_window,
+       int audio_options, int video_options, EDL *edl)
 {
        if(video_options)
        {
@@ -357,7 +355,7 @@ void FileTGA::read_tga(Asset *asset, VFrame *frame, VFrame *data, VFrame* &temp)
 
                if(!temp)
                {
-                       temp = new VFrame(0, -1, width, height, source_cmodel, -1);
+                       temp = new VFrame(width, height, source_cmodel, 0);
                }
                output_frame = temp;
        }
@@ -921,7 +919,7 @@ TGAConfigVideo::~TGAConfigVideo()
 
 void TGAConfigVideo::create_objects()
 {
-       lock_window("TGAConfigVideo::create_objects()");
+       lock_window("TGAConfigVideo::create_objects");
        int x = 10, y = 10;
 
        add_subwindow(new BC_Title(x, y, _("Compression:")));