projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
fileexr.C
diff --git
a/cinelerra-5.1/cinelerra/fileexr.C
b/cinelerra-5.1/cinelerra/fileexr.C
index e84ef84d4bcc68987942b1d035b05575f91c16ee..e786d4e9ea066dd0b78486098e29d725a2ff769e 100644
(file)
--- a/
cinelerra-5.1/cinelerra/fileexr.C
+++ b/
cinelerra-5.1/cinelerra/fileexr.C
@@
-2,6
+2,7
@@
/*
* CINELERRA
* Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
/*
* CINELERRA
* Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-50,8
+51,8
@@
public:
~EXRIStream();
bool read (char c[], int n);
~EXRIStream();
bool read (char c[], int n);
-
Imf::Int64
tellg ();
- void seekg (
Imf::Int64
pos);
+
uint64_t
tellg ();
+ void seekg (
uint64_t
pos);
void clear ();
private:
void clear ();
private:
@@
-67,8
+68,8
@@
public:
~EXROStream();
virtual void write(const char c[], int n);
~EXROStream();
virtual void write(const char c[], int n);
- virtual
Imf::Int64
tellp();
- virtual void seekp(
Imf::Int64
pos);
+ virtual
uint64_t
tellp();
+ virtual void seekp(
uint64_t
pos);
private:
VFrame *data;
private:
VFrame *data;
@@
-106,12
+107,12
@@
bool EXRIStream::read(char c[], int n)
return position >= size;
}
return position >= size;
}
-
Imf::Int64
EXRIStream::tellg ()
+
uint64_t
EXRIStream::tellg ()
{
return position;
}
{
return position;
}
-void EXRIStream::seekg(
Imf::Int64
pos)
+void EXRIStream::seekg(
uint64_t
pos)
{
position = pos;
}
{
position = pos;
}
@@
-141,12
+142,12
@@
void EXROStream::write(const char c[], int n)
data->set_compressed_size(MAX(position, data->get_compressed_size()));
}
data->set_compressed_size(MAX(position, data->get_compressed_size()));
}
-
Imf::Int64
EXROStream::tellp()
+
uint64_t
EXROStream::tellp()
{
return position;
}
{
return position;
}
-void EXROStream::seekp(
Imf::Int64
pos)
+void EXROStream::seekp(
uint64_t
pos)
{
position = pos;
}
{
position = pos;
}
@@
-281,7
+282,7
@@
int FileEXR::read_frame_header(char *path)
// EXRIStream exr_stream(buffer, size);
// Imf::InputFile file(exr_stream);
// EXRIStream exr_stream(buffer, size);
// Imf::InputFile file(exr_stream);
-
+ if( access(path, R_OK) ) return 1;
Imf::InputFile file(path);
Imath::Box2i dw = file.header().dataWindow();
Imf::InputFile file(path);
Imath::Box2i dw = file.header().dataWindow();
@@
-506,6
+507,15
@@
int FileEXR::write_frame(VFrame *frame, VFrame *data, FrameWriterUnit *unit)
return 0;
}
return 0;
}
+int FileEXR::can_copy_from(Asset *asset, int64_t position)
+{
+ if(asset->format == FILE_EXR ||
+ asset->format == FILE_EXR_LIST)
+ return 1;
+
+ return 0;
+}
+
FrameWriterUnit* FileEXR::new_writer_unit(FrameWriter *writer)
{
return new EXRUnit(this, writer);
FrameWriterUnit* FileEXR::new_writer_unit(FrameWriter *writer)
{
return new EXRUnit(this, writer);
@@
-532,6
+542,8
@@
EXRConfigVideo::EXRConfigVideo(BC_WindowBase *parent_window, Asset *asset)
{
this->parent_window = parent_window;
this->asset = asset;
{
this->parent_window = parent_window;
this->asset = asset;
+// *** CONTEXT_HELP ***
+ context_help_set_keyword("Single File Rendering");
}
EXRConfigVideo::~EXRConfigVideo()
}
EXRConfigVideo::~EXRConfigVideo()