X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileexr.C;h=998372b50f1d10c4f341dc64232e901701fdc6d8;hb=98e035865979cda9805a58a85d52f8d70a7ec54e;hp=78f339cb517add95ab9661c4c7033f877ac0c951;hpb=ff39de4e9fef6cf73f012b351c52bfe144a275d2;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/fileexr.C b/cinelerra-5.1/cinelerra/fileexr.C
index 78f339cb..998372b5 100644
--- a/cinelerra-5.1/cinelerra/fileexr.C
+++ b/cinelerra-5.1/cinelerra/fileexr.C
@@ -31,16 +31,16 @@
 #include "mwindow.inc"
 #include "vframe.h"
 
-#include "OpenEXR/ImfChannelList.h"
-#include "OpenEXR/ImfChromaticities.h"
-#include "OpenEXR/ImfCompression.h"
-#include "OpenEXR/ImfIO.h"
-#include "OpenEXR/ImfInputFile.h"
-#include "OpenEXR/ImfOutputFile.h"
-#include "OpenEXR/ImfPixelType.h"
-#include "OpenEXR/ImfRgbaFile.h"
-#include "OpenEXR/ImfRgbaYca.h"
-#include "OpenEXR/ImfVersion.h"
+#include "ImfChannelList.h"
+#include "ImfChromaticities.h"
+#include "ImfCompression.h"
+#include "ImfIO.h"
+#include "ImfInputFile.h"
+#include "ImfOutputFile.h"
+#include "ImfPixelType.h"
+#include "ImfRgbaFile.h"
+#include "ImfRgbaYca.h"
+#include "ImfVersion.h"
 
 class EXRIStream : public Imf::IStream
 {
@@ -572,10 +572,8 @@ EXRUnit::~EXRUnit()
 
 EXRConfigVideo::EXRConfigVideo(BC_WindowBase *parent_window, Asset *asset)
  : BC_Window(_(PROGRAM_NAME ": Video Compression"),
- 	parent_window->get_abs_cursor_x(1),
- 	parent_window->get_abs_cursor_y(1),
-	300,
-	BC_OKButton::calculate_h() + 100)
+	parent_window->get_abs_cursor_x(1), parent_window->get_abs_cursor_y(1),
+	xS(300), BC_OKButton::calculate_h() + yS(100))
 {
 	this->parent_window = parent_window;
 	this->asset = asset;
@@ -588,13 +586,13 @@ EXRConfigVideo::~EXRConfigVideo()
 void EXRConfigVideo::create_objects()
 {
 	lock_window("EXRConfigVideo::create_objects");
-	int x = 10, y = 10;
+	int x = xS(10), y = yS(10);
 	add_subwindow(new EXRUseAlpha(this, x, y));
-	y += 30;
+	y += yS(30);
 	EXRCompression *menu;
 	add_subwindow(new BC_Title(x, y, _("Compression:")));
-	x += 110;
-	add_subwindow(menu = new EXRCompression(this, x, y, 100));
+	x += xS(110);
+	add_subwindow(menu = new EXRCompression(this, x, y, xS(100)));
 	menu->create_objects();
 	add_subwindow(new BC_OKButton(this));
 	show_window(1);
@@ -623,9 +621,7 @@ int EXRUseAlpha::handle_event()
 
 
 EXRCompression::EXRCompression(EXRConfigVideo *gui, int x, int y, int w)
- : BC_PopupMenu(x,
- 	y,
-	w,
+ : BC_PopupMenu(x, y, w,
 	FileEXR::compression_to_str(gui->asset->exr_compression))
 {
 	this->gui = gui;