Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Antoine Belvire
otb
Commits
aff165ee
Commit
aff165ee
authored
18 years ago
by
Thomas Feuvrier
Browse files
Options
Downloads
Patches
Plain Diff
MAJ via l'implémentation de l'écriture GDAL
Suppression de la CAI
parent
2c61570d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Code/IO/otbONERAImageIO.cxx
+28
-47
28 additions, 47 deletions
Code/IO/otbONERAImageIO.cxx
with
28 additions
and
47 deletions
Code/IO/otbONERAImageIO.cxx
+
28
−
47
View file @
aff165ee
...
...
@@ -52,7 +52,6 @@ ONERAImageIO::ONERAImageIO()
m_Origin
[
0
]
=
0.0
;
m_Origin
[
1
]
=
0.0
;
m_FlagWriteImageInformation
=
true
;
}
...
...
@@ -197,6 +196,11 @@ void ONERAImageIO::Read(void* buffer)
int
lPremiereLigne
=
this
->
GetIORegion
().
GetIndex
()[
1
]
;
// [1... ]
int
lPremiereColonne
=
this
->
GetIORegion
().
GetIndex
()[
0
]
;
// [1... ]
otbMsgDevMacro
(
<<
" ONERAImageIO::Read() "
);
otbMsgDevMacro
(
<<
" Dimensions de l'image : "
<<
m_Dimensions
[
0
]
<<
","
<<
m_Dimensions
[
1
]);
otbMsgDevMacro
(
<<
" Region lue (IORegion) : "
<<
this
->
GetIORegion
());
otbMsgDevMacro
(
<<
" Nb Of Components : "
<<
this
->
GetNumberOfComponents
());
//read header information file:
if
(
!
this
->
OpenOneraDataFileForReading
(
m_FileName
.
c_str
())
)
{
...
...
@@ -372,6 +376,14 @@ void ONERAImageIO::InternalReadImageInformation()
}
this
->
SetNumberOfDimensions
(
2
);
otbMsgDebugMacro
(
<<
"Driver to read: ONERA"
);
otbMsgDebugMacro
(
<<
" Read file : "
<<
m_FileName
);
otbMsgDebugMacro
(
<<
" Size : "
<<
m_Dimensions
[
0
]
<<
","
<<
m_Dimensions
[
1
]);
otbMsgDebugMacro
(
<<
" ComponentType : "
<<
this
->
GetComponentType
()
);
otbMsgDebugMacro
(
<<
" NumberOfComponents : "
<<
this
->
GetNumberOfComponents
());
otbMsgDebugMacro
(
<<
" NbOctetPixel : "
<<
m_NbOctetPixel
);
}
...
...
@@ -452,63 +464,32 @@ bool ONERAImageIO::CanWriteFile( const char* FileNameToWrite )
void
ONERAImageIO
::
Write
(
const
void
*
buffer
)
{
if
(
m_FlagWriteImageInformation
==
true
)
{
otbMsgDevMacro
(
<<
"ONERAImageIO::Write() m_FlagWriteImageInformation : "
<<
m_FlagWriteImageInformation
);
this
->
WriteImageInformation
();
m_FlagWriteImageInformation
=
false
;
}
unsigned
long
step
=
this
->
GetNumberOfComponents
();
unsigned
long
step
=
this
->
GetNumberOfComponents
();
const
unsigned
long
numberOfBytes
=
this
->
GetImageSizeInBytes
();
const
unsigned
long
numberOfComponents
=
this
->
GetImageSizeInComponents
();
int
lNbLignes
=
this
->
GetIORegion
().
GetSize
()[
1
];
int
lNbColonnes
=
this
->
GetIORegion
().
GetSize
()[
0
];
int
lPremiereLigne
=
this
->
GetIORegion
().
GetIndex
()[
1
]
;
// [1... ]
int
lPremiereColonne
=
this
->
GetIORegion
().
GetIndex
()[
0
]
;
// [1... ]
unsigned
long
numberOfBytesPerLines
=
step
*
lNbColonnes
*
m_NbOctetPixel
;
unsigned
long
headerLength
=
ONERA_HEADER_LENGTH
+
4
+
numberOfBytesPerLines
;
unsigned
long
offset
;
unsigned
long
numberOfBytesToBeWrite
=
step
*
m_NbOctetPixel
*
lNbColonnes
;
unsigned
long
numberOfBytesRegion
=
step
*
m_NbOctetPixel
*
lNbColonnes
*
lNbLignes
;
unsigned
long
numberOfBytesWrite
;
char
*
tempmemory
=
new
char
[
numberOfBytesRegion
];
memcpy
(
tempmemory
,
buffer
,
numberOfBytesRegion
);
char
*
tempmemory
=
new
char
[
numberOfBytes
];
memcpy
(
tempmemory
,
buffer
,
numberOfBytes
);
if
(
this
->
GetComponentType
()
==
FLOAT
)
{
itk
::
ByteSwapper
<
float
>::
SwapRangeFromSystemToLittleEndian
(
reinterpret_cast
<
float
*>
(
tempmemory
),
numberOf
BytesRegion
);
reinterpret_cast
<
float
*>
(
tempmemory
),
numberOf
Components
);
}
int
lNbLignes
=
this
->
GetIORegion
().
GetSize
()[
1
];
int
lNbColonnes
=
this
->
GetIORegion
().
GetSize
()[
0
];
char
*
value
=
new
char
[
numberOfBytesToBeWrite
];
unsigned
long
cpt
=
0
;
for
(
int
LineNo
=
lPremiereLigne
;
LineNo
<
lPremiereLigne
+
lNbLignes
;
LineNo
++
)
{
for
(
unsigned
long
i
=
0
;
i
<
numberOfBytesToBeWrite
;
i
=
i
+
2
*
m_NbOctetPixel
)
{
memcpy
((
void
*
)(
&
(
value
[
i
])),(
const
void
*
)(
&
(
tempmemory
[
cpt
])),(
size_t
)(
2
*
m_NbOctetPixel
)
);
cpt
+=
2
*
m_NbOctetPixel
;
}
offset
=
headerLength
+
numberOfBytesPerLines
*
LineNo
;
offset
+=
m_NbOctetPixel
*
lPremiereColonne
;
m_Datafile
.
seekg
(
offset
,
std
::
ios
::
beg
);
m_Datafile
.
write
(
static_cast
<
char
*>
(
value
),
numberOfBytesToBeWrite
);
numberOfBytesWrite
=
m_Datafile
.
gcount
();
m_Datafile
.
seekg
(
offset
,
std
::
ios
::
end
);
}
unsigned
long
numberOfBytesPerLines
=
2
*
lNbColonnes
*
m_NbOctetPixel
;
unsigned
long
headerLength
=
ONERA_HEADER_LENGTH
+
4
+
numberOfBytesPerLines
;
unsigned
long
offset
;
delete
[]
value
;
offset
=
headerLength
+
numberOfBytesPerLines
;
m_Datafile
.
seekg
(
offset
,
std
::
ios
::
beg
);
m_Datafile
.
write
(
static_cast
<
const
char
*>
(
tempmemory
)
,
numberOfBytes
);
delete
[]
tempmemory
;
}
void
ONERAImageIO
::
WriteImageInformation
()
...
...
@@ -536,7 +517,7 @@ void ONERAImageIO::WriteImageInformation()
m_Headerfile
<<
"# [dans ordre LSBfirst = big-endian]"
<<
std
::
endl
;
std
::
string
sPixelType
(
"cmplx_real_4"
);
if
(
(
this
->
Get
PixelType
()
==
COMPLEX
)
&&
(
m_ComponentType
==
FLOAT
)
)
if
(
m_
PixelType
==
COMPLEX
&&
m_ComponentType
==
FLOAT
)
{
sPixelType
=
"cmplx_real_4"
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment