Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit255f034

Browse files
authored
Fixed some /analyze warnings (#105)
1 parentb3570f8 commit255f034

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎UVAtlas/inc/UVAtlas.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ namespace DirectX
161161
_In_reads_(nFaces *3)const uint32_t* adjacency,
162162
_In_reads_opt_(nFaces *3)const uint32_t* falseEdgeAdjacency,
163163
_In_reads_opt_(nFaces *3)const float* pIMTArray,
164-
_In_opt_ std::function<HRESULT __cdecl(float percentComplete)> statusCallBack,
164+
_In_ std::function<HRESULT __cdecl(float percentComplete)> statusCallBack,
165165
_In_ float callbackFrequency,
166166
_In_ UVATLAS options,
167167
_Inout_ std::vector<UVAtlasVertex>& vMeshOutVertexBuffer,
@@ -204,10 +204,10 @@ namespace DirectX
204204
_In_ size_t nFaces,
205205
_In_ size_t maxChartNumber,
206206
_In_ float maxStretch,
207-
_In_reads_(nFaces *3)const uint32_t* adjacency,
208-
_In_reads_opt_(nFaces *3)const uint32_t* falseEdgeAdjacency,
209-
_In_reads_opt_(nFaces *3)const float* pIMTArray,
210-
_In_opt_ std::function<HRESULT __cdecl(float percentComplete)> statusCallBack,
207+
_In_reads_(nFaces *3)const uint32_t* adjacency,
208+
_In_reads_opt_(nFaces *3)const uint32_t* falseEdgeAdjacency,
209+
_In_reads_opt_(nFaces *3)const float* pIMTArray,
210+
_In_ std::function<HRESULT __cdecl(float percentComplete)> statusCallBack,
211211
_In_ float callbackFrequency,
212212
_In_ UVATLAS options,
213213
_Inout_ std::vector<UVAtlasVertex>& vMeshOutVertexBuffer,
@@ -229,7 +229,7 @@ namespace DirectX
229229
_In_size_t height,
230230
_In_float gutter,
231231
_In_const std::vector<uint32_t>& vPartitionResultAdjacency,
232-
_In_opt_ std::function<HRESULT__cdecl(float percentComplete)> statusCallBack,
232+
_In_ std::function<HRESULT__cdecl(float percentComplete)> statusCallBack,
233233
_In_ float callbackFrequency);
234234

235235

@@ -271,7 +271,7 @@ namespace DirectX
271271
_In_reads_(signalStride* nVerts)const float* pVertexSignal,
272272
_In_ size_t signalDimension,
273273
_In_ size_t signalStride,
274-
_In_opt_ std::function<HRESULT __cdecl(float percentComplete)> statusCallBack,
274+
_In_ std::function<HRESULT __cdecl(float percentComplete)> statusCallBack,
275275
_Out_writes_(nFaces *3) float* pIMTArray);
276276

277277
// This function is used to calculate the IMT from data that varies over the
@@ -301,10 +301,10 @@ namespace DirectX
301301
_In_ size_t nFaces,
302302
_In_ size_t signalDimension,
303303
_In_ float maxUVDistance,
304-
_In_ std::function<HRESULT __cdecl(const DirectX::XMFLOAT2* uv,size_t primitiveID,size_t signalDimension,void* userData,float* signalOut)>
304+
_In_std::function<HRESULT __cdecl(const DirectX::XMFLOAT2* uv,size_t primitiveID,size_t signalDimension,void* userData,float* signalOut)>
305305
signalCallback,
306306
_In_opt_ void* userData,
307-
_In_opt_ std::function<HRESULT __cdecl(float percentComplete)> statusCallBack,
307+
_In_ std::function<HRESULT __cdecl(float percentComplete)> statusCallBack,
308308
_Out_writes_(nFaces *3) float* pIMTArray);
309309

310310
// This function is used to calculate the IMT from texture data. Given a texture
@@ -328,7 +328,7 @@ namespace DirectX
328328
_In_ size_t width,
329329
_In_ size_t height,
330330
_In_ UVATLAS_IMT options,
331-
_In_opt_ std::function<HRESULT __cdecl(float percentComplete)> statusCallBack,
331+
_In_ std::function<HRESULT __cdecl(float percentComplete)> statusCallBack,
332332
_Out_writes_(nFaces *3) float* pIMTArray);
333333

334334
// This function is very similar to UVAtlasComputeIMTFromTexture, but it can
@@ -355,7 +355,7 @@ namespace DirectX
355355
_In_ size_t signalDimension,
356356
_In_ size_t nComponents,
357357
_In_ UVATLAS_IMT options,
358-
_In_opt_ std::function<HRESULT __cdecl(float percentComplete)> statusCallBack,
358+
_In_ std::function<HRESULT __cdecl(float percentComplete)> statusCallBack,
359359
_Out_writes_(nFaces *3) float* pIMTArray);
360360

361361
// This function is for applying the a vertex remap array from UVAtlasCreate/UVAtlasPartition to a vertex buffer

‎UVAtlas/isochart/UVAtlas.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ namespace
230230

231231
if (FindEquivParent(pEquivs, v1) !=FindEquivParent(pEquivs, v2))
232232
{
233-
DPF(0,"False edge data is invalid, %d and %d are only connected by false edges.", pIndexData[v1], pIndexData[v2]);
233+
DPF(0,"False edge data is invalid, %u and %u are only connected by false edges.", pIndexData[v1], pIndexData[v2]);
234234
return HRESULT_E_INVALID_DATA;
235235
}
236236
}
@@ -253,7 +253,7 @@ namespace
253253
_In_reads_(nFaces *3)const uint32_t* adjacency,
254254
_In_reads_opt_(nFaces *3)const uint32_t* falseEdgeAdjacency,
255255
_In_reads_opt_(nFaces *3)const float* pIMTArray,
256-
_In_opt_ LPISOCHARTCALLBACK statusCallBack,
256+
_In_LPISOCHARTCALLBACK& statusCallBack,
257257
_In_ float callbackFrequency,
258258
_In_ unsigned int options,
259259
_Inout_ std::vector<UVAtlasVertex>& vMeshOutVertexBuffer,
@@ -462,7 +462,7 @@ namespace
462462
_In_size_t height,
463463
_In_float gutter,
464464
_In_const std::vector<uint32_t>& vPartitionResultAdjacency,
465-
_In_opt_ LPISOCHARTCALLBACK statusCallback,
465+
_In_LPISOCHARTCALLBACK& statusCallback,
466466
float callbackFrequency,
467467
_In_unsignedint uStageInfo)
468468
{

‎UVAtlas/isochart/UVAtlasRepacker.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ namespace IsochartRepacker
138138
_In_ size_t Height,
139139
_In_ float Gutter,
140140
_In_ unsigned int Stage,
141-
_In_opt_ Isochart::LPISOCHARTCALLBACK pCallback = nullptr,
141+
_In_ Isochart::LPISOCHARTCALLBACK pCallback = nullptr,
142142
_In_ float Frequency = 0.01f,
143143
_In_ size_t iNumRotate = 5);
144144

‎UVAtlas/isochart/isochart.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ namespace Isochart
9595
_Out_opt_ size_t* pChartNumberOut,
9696
_Out_opt_ float* pMaxStretchOut,
9797
_In_ unsigned int Stage,
98-
_In_opt_ LPISOCHARTCALLBACK pCallback = nullptr,
98+
_In_ LPISOCHARTCALLBACK pCallback = nullptr,
9999
_In_ float Frequency = 0.01f,// Call callback function each time completed 1% work of all task
100100
_In_opt_const uint32_t* pSplitHint = nullptr,// Optional parameter, Generated by copying from the pOriginalAjacency
101101
// and for each triangle, if the edge shared by itself and ajacency triangle

‎UVAtlas/isochart/packingcharts.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2148,11 +2148,11 @@ static void BruteForceOverlappingChecking(
21482148
if (bIsIntersect)
21492149
{
21502150
DPF(0,"Found intersection...");
2151-
DPF(0,"Edge 1 is %d-%d",
2151+
DPF(0,"Edge 1 is %u-%u",
21522152
pVertList1[edge1.dwVertexID[0]].dwIDInRootMesh,
21532153
pVertList1[edge1.dwVertexID[1]].dwIDInRootMesh);
21542154

2155-
DPF(0,"Edge 2 is %d-%d",
2155+
DPF(0,"Edge 2 is %u-%u",
21562156
pVertList2[edge2.dwVertexID[0]].dwIDInRootMesh,
21572157
pVertList2[edge2.dwVertexID[1]].dwIDInRootMesh);
21582158

@@ -3256,7 +3256,7 @@ HRESULT CIsochartMesh::ScanAlongBoundayEdges(
32563256
{
32573257
if (pScanEdge)
32583258
{
3259-
DPF(0,"Vertex %d has more than 2 boundary edges leaving it", pVertex->dwIDInRootMesh);
3259+
DPF(0,"Vertex %u has more than 2 boundary edges leaving it", pVertex->dwIDInRootMesh);
32603260
return HRESULT_E_INVALID_DATA;
32613261
}
32623262

‎UVAtlas/isochart/progressivemesh.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ HRESULT CProgressiveMesh::Simplify()
310310
}
311311
}
312312

313-
DPF(3,"#Remained vert: %d\n", dwRemainVertNumber);
313+
DPF(3,"#Remained vert: %u\n", dwRemainVertNumber);
314314
DPF(3,"Exported simplified mesh");
315315

316316
return S_OK;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp