Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed octree related project files and change sscanf_s to sscanf #18

Open
wants to merge 1 commit into
base: 5.4-no-dcmtk
Choose a base branch
from
Open

Removed octree related project files and change sscanf_s to sscanf #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 0 additions & 60 deletions Source/Raymarcher/Private/Rendering/OctreeShaders.cpp
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions Source/Raymarcher/Private/Util/RaymarchUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include "SceneInterface.h"
#include "SceneUtils.h"
#include "ShaderParameterUtils.h"
#include "Rendering/OctreeShaders.h"
#include "VolumeTextureToolkit/Public/TextureUtilities.h"

#include <Engine/TextureRenderTargetVolume.h>
Expand Down Expand Up @@ -97,7 +96,7 @@ void URaymarchUtils::GenerateOctree(FBasicRaymarchRenderingResources& Resources)
ENQUEUE_RENDER_COMMAND(CaptureCommand)
([=](FRHICommandListImmediate& RHICmdList)
{
GenerateOctreeForVolume_RenderThread(RHICmdList, Resources);
// GenerateOctreeForVolume_RenderThread(RHICmdList, Resources);
});
}

Expand Down
81 changes: 0 additions & 81 deletions Source/Raymarcher/Public/Rendering/OctreeShaders.h
View file
Open in desktop

This file was deleted.

107 changes: 0 additions & 107 deletions Source/Raymarcher/Shaders/Private/GenerateOctreeShader.usf
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions Source/VolumeTextureToolkit/Private/VolumeAsset/DICOMParser/DICOMAppHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ void DICOMAppHelper::ImagePositionPatientCallback(

if (val)
{
sscanf_s(reinterpret_cast<char*>(val), "%f\\%f\\%f", &ord.ImagePositionPatient[0], &ord.ImagePositionPatient[1],
sscanf(reinterpret_cast<char*>(val), "%f\\%f\\%f", &ord.ImagePositionPatient[0], &ord.ImagePositionPatient[1],
&ord.ImagePositionPatient[2]);
}
else
Expand All @@ -550,7 +550,7 @@ void DICOMAppHelper::ImagePositionPatientCallback(
if (val)
{
// file found, add new values
sscanf_s(reinterpret_cast<char*>(val), "%f\\%f\\%f", &(*it).second.ImagePositionPatient[0],
sscanf(reinterpret_cast<char*>(val), "%f\\%f\\%f", &(*it).second.ImagePositionPatient[0],
&(*it).second.ImagePositionPatient[1], &(*it).second.ImagePositionPatient[2]);
}
else
Expand Down Expand Up @@ -578,7 +578,7 @@ void DICOMAppHelper::ImageOrientationPatientCallback(
DICOMOrderingElements ord;
if (val)
{
sscanf_s(reinterpret_cast<char*>(val), "%f\\%f\\%f\\%f\\%f\\%f", &ord.ImageOrientationPatient[0],
sscanf(reinterpret_cast<char*>(val), "%f\\%f\\%f\\%f\\%f\\%f", &ord.ImageOrientationPatient[0],
&ord.ImageOrientationPatient[1], &ord.ImageOrientationPatient[2], &ord.ImageOrientationPatient[3],
&ord.ImageOrientationPatient[4], &ord.ImageOrientationPatient[5]);
}
Expand All @@ -605,7 +605,7 @@ void DICOMAppHelper::ImageOrientationPatientCallback(
// file found, add new values
if (val)
{
sscanf_s(reinterpret_cast<char*>(val), "%f\\%f\\%f\\%f\\%f\\%f", &(*it).second.ImageOrientationPatient[0],
sscanf(reinterpret_cast<char*>(val), "%f\\%f\\%f\\%f\\%f\\%f", &(*it).second.ImageOrientationPatient[0],
&(*it).second.ImageOrientationPatient[1], &(*it).second.ImageOrientationPatient[2],
&(*it).second.ImageOrientationPatient[3], &(*it).second.ImageOrientationPatient[4],
&(*it).second.ImageOrientationPatient[5]);
Expand Down Expand Up @@ -698,7 +698,7 @@ void DICOMAppHelper::PixelSpacingCallback(
{
if (group == 0x0028 && element == 0x0030)
{
if (!val || sscanf_s(reinterpret_cast<char*>(val), "%f\\%f", &this->PixelSpacing[0], &this->PixelSpacing[1]) != 2)
if (!val || sscanf(reinterpret_cast<char*>(val), "%f\\%f", &this->PixelSpacing[0], &this->PixelSpacing[1]) != 2)
{
this->PixelSpacing[0] = this->PixelSpacing[1] = 0.0;
}
Expand Down
4 changes: 2 additions & 2 deletions Source/VolumeTextureToolkit/Private/VolumeAsset/DICOMParser/DICOMFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ float DICOMFile::ReadAsciiFloat(int len)
data >> ret;
delete [] val2;
#else
sscanf_s(val, "%e", &ret);
sscanf(val, "%e", &ret);
#endif

std::cout << "Read ASCII float: " << ret << std::endl;
Expand Down Expand Up @@ -259,7 +259,7 @@ int DICOMFile::ReadAsciiInt(int len)
data >> ret;
delete [] val2;
#else
sscanf_s(val, "%d", &ret);
sscanf(val, "%d", &ret);
#endif

std::cout << "Read ASCII int: " << ret << std::endl;
Expand Down
2 changes: 1 addition & 1 deletion Source/VolumeTextureToolkit/Public/VolumeAsset/DICOMParser/DICOMConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <iomanip>
#include <iostream>

#define DICOM_EXPORT __declspec(dllexport)
#define DICOM_EXPORT
#define DICOM_EXPIMP_TEMPLATE

#endif // __DICOM_CONFIG_H_