Skip to content

Commit 4df28a3

Browse files
bashi-bazoukbashi-bazouk
committed
Update initializater orderings to avoid -Wreorder warnings.
1 parent 5ea5e3d commit 4df28a3

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎camera/basic/src/main/cpp/camera_engine.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ CameraEngine::CameraEngine(android_app* app)
3232
cameraGranted_(false),
3333
rotation_(0),
3434
cameraReady_(false),
35+
camera_(nullptr),
3536
yuvReader_(nullptr),
36-
jpgReader_(nullptr),
37-
camera_(nullptr) {
37+
jpgReader_(nullptr) {
3838
memset(&savedNativeWinRes_, 0, sizeof(savedNativeWinRes_));
3939
}
4040

‎camera/basic/src/main/cpp/camera_manager.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ static const uint64_t kMaxExposureTime = static_cast<uint64_t>(250000000);
3434
NDKCamera::NDKCamera()
3535
: cameraMgr_(nullptr),
3636
activeCameraId_(""),
37-
outputContainer_(nullptr),
38-
captureSessionState_(CaptureSessionState::MAX_STATE),
3937
cameraFacing_(ACAMERA_LENS_FACING_BACK),
4038
cameraOrientation_(0),
39+
outputContainer_(nullptr),
40+
captureSessionState_(CaptureSessionState::MAX_STATE),
4141
exposureTime_(static_cast<int64_t>(0)) {
4242
valid_ = false;
4343
requests_.resize(CAPTURE_REQUEST_COUNT);

‎camera/basic/src/main/cpp/image_reader.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void OnImageCallback(void *ctx, AImageReader *reader) {
5555
* Constructor
5656
*/
5757
ImageReader::ImageReader(ImageFormat *res, enum AIMAGE_FORMATS format)
58-
: reader_(nullptr), presentRotation_(0) {
58+
: presentRotation_(0), reader_(nullptr) {
5959
callback_ = nullptr;
6060
callbackCtx_ = nullptr;
6161

@@ -454,4 +454,4 @@ void ImageReader::WriteFile(AImage* image) {
454454
fclose(file);
455455
}
456456
AImage_delete(image);
457-
}
457+
}

‎camera/texture-view/src/main/cpp/camera_manager.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ static const uint64_t kMaxExposureTime = static_cast<uint64_t>(250000000);
3636
NDKCamera::NDKCamera()
3737
: cameraMgr_(nullptr),
3838
activeCameraId_(""),
39-
outputContainer_(nullptr),
40-
captureSessionState_(CaptureSessionState::MAX_STATE),
4139
cameraFacing_(ACAMERA_LENS_FACING_BACK),
4240
cameraOrientation_(0),
41+
outputContainer_(nullptr),
42+
captureSessionState_(CaptureSessionState::MAX_STATE),
4343
exposureTime_(static_cast<int64_t>(0)) {
4444
valid_ = false;
4545
requests_.resize(CAPTURE_REQUEST_COUNT);

‎nn-samples/basic/src/main/cpp/simple_model.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ SimpleModel::SimpleModel(size_t size, int protect, int fd, size_t offset) :
3030
model_(nullptr),
3131
compilation_(nullptr),
3232
dimLength_(TENSOR_SIZE),
33-
modelDataFd_(fd),
34-
offset_(offset) {
33+
offset_(offset),
34+
modelDataFd_(fd) {
3535
tensorSize_ = dimLength_;
3636
inputTensor1_.resize(tensorSize_);
3737

@@ -505,4 +505,4 @@ SimpleModel::~SimpleModel() {
505505
close(inputTensor2Fd_);
506506
close(outputTensorFd_);
507507
close(modelDataFd_);
508-
}
508+
}

0 commit comments

Comments
 (0)